aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/poodle.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-04 14:15:53 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:17 +0000
commit271a74fc875210d3dfcc03d557fb5d86d3990a0f (patch)
treef428c434f573180885c4c2404b706f4bf4c550bb /arch/arm/mach-pxa/poodle.c
parentARM: restart: prima2: use new restart hook (diff)
downloadlinux-dev-271a74fc875210d3dfcc03d557fb5d86d3990a0f.tar.xz
linux-dev-271a74fc875210d3dfcc03d557fb5d86d3990a0f.zip
ARM: restart: pxa: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
-rw-r--r--arch/arm/mach-pxa/poodle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index afcb48a5792c..b260ce872d2d 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -417,7 +417,7 @@ static struct i2c_board_info __initdata poodle_i2c_devices[] = {
static void poodle_poweroff(void)
{
- arm_machine_restart('h', NULL);
+ pxa_restart('h', NULL);
}
static void __init poodle_init(void)
@@ -466,4 +466,5 @@ MACHINE_START(POODLE, "SHARP Poodle")
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = poodle_init,
+ .restart = pxa_restart,
MACHINE_END