summaryrefslogtreecommitdiff
path: root/arch/arm/mach-cns3xxx/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 15:32:23 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:09 +0000
commit3921470527fa2800f575dee376712f2a6584db91 (patch)
treeec9834d497175c5a42efe59102fb6ce12fd908f6 /arch/arm/mach-cns3xxx/include
parent6c00071268b19f92d29e5bec873a12380afd9199 (diff)
downloadlinux-3.10-3921470527fa2800f575dee376712f2a6584db91.tar.gz
linux-3.10-3921470527fa2800f575dee376712f2a6584db91.tar.bz2
linux-3.10-3921470527fa2800f575dee376712f2a6584db91.zip
ARM: restart: cns3xxx: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-cns3xxx/include')
-rw-r--r--arch/arm/mach-cns3xxx/include/mach/system.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/system.h b/arch/arm/mach-cns3xxx/include/mach/system.h
index 4f16c9b79f7..f92540d8211 100644
--- a/arch/arm/mach-cns3xxx/include/mach/system.h
+++ b/arch/arm/mach-cns3xxx/include/mach/system.h
@@ -11,7 +11,6 @@
#ifndef __MACH_SYSTEM_H
#define __MACH_SYSTEM_H
-#include <linux/io.h>
#include <asm/proc-fns.h>
static inline void arch_idle(void)
@@ -23,6 +22,8 @@ static inline void arch_idle(void)
cpu_do_idle();
}
-void arch_reset(char mode, const char *cmd);
+static inline void arch_reset(char mode, const char *cmd)
+{
+}
#endif