aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/include/mach/system.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 11:40:09 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 07:57:15 -0500
commit9854a38e371a153c7c4adb2cb7951c27befe0362 (patch)
tree0e4de89b4eb1a27e2e1b2096bc25977ccdf93453 /arch/arm/mach-mmp/include/mach/system.h
parentb23fcd9035a35b032c624ac2f23f40ea941d5355 (diff)
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/mach/system.h')
-rw-r--r--arch/arm/mach-mmp/include/mach/system.h6
1 files changed, 0 insertions, 6 deletions
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 @@
9#ifndef __ASM_MACH_SYSTEM_H 9#ifndef __ASM_MACH_SYSTEM_H
10#define __ASM_MACH_SYSTEM_H 10#define __ASM_MACH_SYSTEM_H
11 11
12#include <mach/cputype.h>
13
14static inline void arch_idle(void) 12static inline void arch_idle(void)
15{ 13{
16 cpu_do_idle(); 14 cpu_do_idle();
@@ -18,9 +16,5 @@ static inline void arch_idle(void)
18 16
19static inline void arch_reset(char mode, const char *cmd) 17static inline void arch_reset(char mode, const char *cmd)
20{ 18{
21 if (cpu_is_pxa168())
22 soft_restart(0xffff0000);
23 else
24 soft_restart(0);
25} 19}
26#endif /* __ASM_MACH_SYSTEM_H */ 20#endif /* __ASM_MACH_SYSTEM_H */