From 83efa516d940e7b9f1d85db6d8d98342fcba1449 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 2 Nov 2011 14:38:07 +0000 Subject: [PATCH] --- yaml --- r: 279817 b: refs/heads/master c: 3f1517a761905c55d1db71cb0afd359d74a76a6c h: refs/heads/master i: 279815: fe021ff8206896191633f931c2260d85bcf39398 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/poodle.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0aaf007d9bc8..7ce1f77b6a93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5bc9e257a4ef3dabc6b5573215983d663ffcd55 +refs/heads/master: 3f1517a761905c55d1db71cb0afd359d74a76a6c diff --git a/trunk/arch/arm/mach-pxa/poodle.c b/trunk/arch/arm/mach-pxa/poodle.c index 50c833177866..afcb48a5792c 100644 --- a/trunk/arch/arm/mach-pxa/poodle.c +++ b/trunk/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;