diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 14:41:14 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:20 +0000 |
| commit | b95ff9fe24e8757380bd9b53891df86f2499ebb8 (patch) | |
| tree | d51361b0a0142be31f611a5520a31cc6a4a83816 /arch | |
| parent | d9ca5839fd4b0c820c19401b72962a1d099cb99e (diff) | |
ARM: restart: shark: use new restart hook
Hook the Shark restart code into the new restart hook rather than
using arch_reset().
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shark/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shark/include/mach/system.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index f4b25d875f3..a851c254ad6 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c @@ -26,7 +26,7 @@ #define ROMCARD_SIZE 0x08000000 #define ROMCARD_START 0x10000000 -void arch_reset(char mode, const char *cmd) +static void shark_restart(char mode, const char *cmd) { short temp; /* Reset the Machine via pc[3] of the sequoia chipset */ @@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark") .init_irq = shark_init_irq, .timer = &shark_timer, .dma_zone_size = SZ_4M, + .restart = shark_restart, MACHINE_END diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h index 21c373b30bb..2cc363a3cd9 100644 --- a/arch/arm/mach-shark/include/mach/system.h +++ b/arch/arm/mach-shark/include/mach/system.h @@ -6,8 +6,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -/* Found in arch/mach-shark/core.c */ -extern void arch_reset(char mode, const char *cmd); +static inline void arch_reset(char mode, const char *cmd) +{ +} static inline void arch_idle(void) { |