diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-02 12:07:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-02 12:07:48 +0200 |
| commit | c1894b4bc7ae58f74b01e4a31b267680c721b727 (patch) | |
| tree | ab56e162ebedc90ee6c88e286ab20ccb066551f3 /arch/arm/mach-ep93xx/clocksource.c | |
| parent | c6cdbe71c9614d2fc409d4d538e80a53a4bcdc32 (diff) | |
| parent | e3b204668525636ee1c0de4d4869822b050d7c69 (diff) | |
| download | barebox-c1894b4bc7ae58f74b01e4a31b267680c721b727.tar.gz barebox-c1894b4bc7ae58f74b01e4a31b267680c721b727.tar.xz | |
Merge branch 'pu' into next
Diffstat (limited to 'arch/arm/mach-ep93xx/clocksource.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/clocksource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/clocksource.c b/arch/arm/mach-ep93xx/clocksource.c index 2a7d90e4e2..3aa8e14a7a 100644 --- a/arch/arm/mach-ep93xx/clocksource.c +++ b/arch/arm/mach-ep93xx/clocksource.c @@ -72,7 +72,7 @@ core_initcall(clocksource_init); /* * Reset the cpu */ -void reset_cpu(ulong ignored) +void __noreturn reset_cpu(unsigned long ignored) { struct syscon_regs *syscon = (struct syscon_regs *)SYSCON_BASE; uint32_t value; |