diff options
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 50c833177866..b260ce872d2d 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -417,12 +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 | } | ||
422 | |||
423 | static void poodle_restart(char mode, const char *cmd) | ||
424 | { | ||
425 | arm_machine_restart('h', cmd); | ||
426 | } | 421 | } |
427 | 422 | ||
428 | static void __init poodle_init(void) | 423 | static void __init poodle_init(void) |
@@ -430,7 +425,6 @@ static void __init poodle_init(void) | |||
430 | int ret = 0; | 425 | int ret = 0; |
431 | 426 | ||
432 | pm_power_off = poodle_poweroff; | 427 | pm_power_off = poodle_poweroff; |
433 | arm_pm_restart = poodle_restart; | ||
434 | 428 | ||
435 | PCFR |= PCFR_OPDE; | 429 | PCFR |= PCFR_OPDE; |
436 | 430 | ||
@@ -472,4 +466,5 @@ MACHINE_START(POODLE, "SHARP Poodle") | |||
472 | .handle_irq = pxa25x_handle_irq, | 466 | .handle_irq = pxa25x_handle_irq, |
473 | .timer = &pxa_timer, | 467 | .timer = &pxa_timer, |
474 | .init_machine = poodle_init, | 468 | .init_machine = poodle_init, |
469 | .restart = pxa_restart, | ||
475 | MACHINE_END | 470 | MACHINE_END |