diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 09:49:47 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 09:49:47 (GMT) |
| commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
| tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-pxa | |
| parent | e879c862fb81b986095ae7a4676b2281c2f97957 (diff) | |
| parent | 3f1517a761905c55d1db71cb0afd359d74a76a6c (diff) | |
| download | linux-fsl-qoriq-59136ef3c596606d3eef920dc3e0fdfa2ce52c6f.tar.xz | |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/poodle.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 50c8331..afcb48a 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -420,17 +420,11 @@ static void poodle_poweroff(void) arm_machine_restart('h', NULL); } -static void poodle_restart(char mode, const char *cmd) -{ - arm_machine_restart('h', cmd); -} - static void __init poodle_init(void) { int ret = 0; pm_power_off = poodle_poweroff; - arm_pm_restart = poodle_restart; PCFR |= PCFR_OPDE; |