summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/reset.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 18:06:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 13:57:16 +0100
commitbaa9588344d35d751d6e2b1677ec67e7b32d2878 (patch)
tree16996ca64d788d0fcd66053dd9d50d4557eea5c2 /arch/arm/mach-omap1/reset.c
parentARM: restart: nomadik: use new restart hook (diff)
downloadlinux-baa9588344d35d751d6e2b1677ec67e7b32d2878.tar.xz
linux-baa9588344d35d751d6e2b1677ec67e7b32d2878.zip
ARM: restart: omap: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/reset.c')
-rw-r--r--arch/arm/mach-omap1/reset.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c
index ad951ee69205..91d199b64979 100644
--- a/arch/arm/mach-omap1/reset.c
+++ b/arch/arm/mach-omap1/reset.c
@@ -5,10 +5,9 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/system.h>
#include <plat/prcm.h>
-void omap1_arch_reset(char mode, const char *cmd)
+void omap1_restart(char mode, const char *cmd)
{
/*
* Workaround for 5912/1611b bug mentioned in sprz209d.pdf p. 28
@@ -21,5 +20,3 @@ void omap1_arch_reset(char mode, const char *cmd)
omap_writew(1, ARM_RSTCT1);
}
-
-void (*arch_reset)(char, const char *) = omap1_arch_reset;