diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 16:40:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:15 +0100 |
| commit | 9854a38e371a153c7c4adb2cb7951c27befe0362 (patch) | |
| tree | 0e4de89b4eb1a27e2e1b2096bc25977ccdf93453 /arch/arm/mach-mmp/include | |
| parent | ARM: restart: lpc32xx: use new restart hook (diff) | |
| download | linux-9854a38e371a153c7c4adb2cb7951c27befe0362.tar.xz linux-9854a38e371a153c7c4adb2cb7951c27befe0362.zip | |
ARM: restart: mmp: 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/arm/mach-mmp/include')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/pxa168.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/system.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h index 7fb568d2845b..a677aa732c26 100644 --- a/arch/arm/mach-mmp/include/mach/pxa168.h +++ b/arch/arm/mach-mmp/include/mach/pxa168.h @@ -5,6 +5,7 @@ struct sys_timer; extern struct sys_timer pxa168_timer; extern void __init pxa168_init_irq(void); +extern void pxa168_restart(char, const char *); extern void pxa168_clear_keypad_wakeup(void); #include <linux/i2c.h> diff --git a/arch/arm/mach-mmp/include/mach/system.h b/arch/arm/mach-mmp/include/mach/system.h index cb0637933a85..c434f3a862fe 100644 --- a/arch/arm/mach-mmp/include/mach/system.h +++ b/arch/arm/mach-mmp/include/mach/system.h @@ -9,8 +9,6 @@ #ifndef __ASM_MACH_SYSTEM_H #define __ASM_MACH_SYSTEM_H -#include <mach/cputype.h> - static inline void arch_idle(void) { cpu_do_idle(); @@ -18,9 +16,5 @@ static inline void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - if (cpu_is_pxa168()) - soft_restart(0xffff0000); - else - soft_restart(0); } #endif /* __ASM_MACH_SYSTEM_H */ |