summaryrefslogtreecommitdiff
path: root/arch/arm/mach-integrator/include/mach
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-03 19:54:37 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:13 +0000
commit6338b66f8a8c5bc8ff8671acbfdda02756e92c0a (patch)
treefdb49df958db1002890f45f38ba93f0b0e8d0e79 /arch/arm/mach-integrator/include/mach
parent00e9967e0dfa0d4c871ac3be5bd1cb28348e68d3 (diff)
ARM: restart: integrator: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/include/mach')
-rw-r--r--arch/arm/mach-integrator/include/mach/system.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-integrator/include/mach/system.h b/arch/arm/mach-integrator/include/mach/system.h
index e1551b8dab77..12fc8c3157c3 100644
--- a/arch/arm/mach-integrator/include/mach/system.h
+++ b/arch/arm/mach-integrator/include/mach/system.h
@@ -21,8 +21,6 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-#include <mach/cm.h>
-
static inline void arch_idle(void)
{
/*
@@ -34,11 +32,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
- /*
- * To reset, we hit the on-board reset register
- * in the system FPGA
- */
- cm_control(CM_CTRL_RESET, CM_CTRL_RESET);
}
#endif