diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-04 10:15:53 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:17 -0500 |
commit | 271a74fc875210d3dfcc03d557fb5d86d3990a0f (patch) | |
tree | f428c434f573180885c4c2404b706f4bf4c550bb /arch/arm/mach-pxa/poodle.c | |
parent | 125c4033f0187d7264f08d7cf1474252df4f4c17 (diff) |
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.c | 3 |
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[] = { | |||
417 | 417 | ||
418 | static void poodle_poweroff(void) | 418 | static void poodle_poweroff(void) |
419 | { | 419 | { |
420 | arm_machine_restart('h', NULL); | 420 | pxa_restart('h', NULL); |
421 | } | 421 | } |
422 | 422 | ||
423 | static void __init poodle_init(void) | 423 | static void __init poodle_init(void) |
@@ -466,4 +466,5 @@ MACHINE_START(POODLE, "SHARP Poodle") | |||
466 | .handle_irq = pxa25x_handle_irq, | 466 | .handle_irq = pxa25x_handle_irq, |
467 | .timer = &pxa_timer, | 467 | .timer = &pxa_timer, |
468 | .init_machine = poodle_init, | 468 | .init_machine = poodle_init, |
469 | .restart = pxa_restart, | ||
469 | MACHINE_END | 470 | MACHINE_END |