diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-02-03 11:47:44 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-02-07 08:30:21 -0500 |
commit | a3305a8835ed039363822523a3cac24e990083dc (patch) | |
tree | 7549fa6171d1a60f64085a1795157c1878f4a4e6 /arch/mips/kernel | |
parent | a84c96e202c286c1d56fed4a81bd850017aa2c64 (diff) |
[MIPS] Revert "mips: add pm_power_off"
pm_power_off duplicates the functionality of _machine_restart.
This reverts b142159fa5ffbad73b6927fafa5440148030f3f1 commit.
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/reset.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c index 5e37df3111ad..ae2ba67b7ef6 100644 --- a/arch/mips/kernel/reset.c +++ b/arch/mips/kernel/reset.c | |||
@@ -12,9 +12,6 @@ | |||
12 | #include <linux/reboot.h> | 12 | #include <linux/reboot.h> |
13 | #include <asm/reboot.h> | 13 | #include <asm/reboot.h> |
14 | 14 | ||
15 | void (*pm_power_off)(void); | ||
16 | EXPORT_SYMBOL(pm_power_off); | ||
17 | |||
18 | /* | 15 | /* |
19 | * Urgs ... Too many MIPS machines to handle this in a generic way. | 16 | * Urgs ... Too many MIPS machines to handle this in a generic way. |
20 | * So handle all using function pointers to machine specific | 17 | * So handle all using function pointers to machine specific |
@@ -36,9 +33,6 @@ void machine_halt(void) | |||
36 | 33 | ||
37 | void machine_power_off(void) | 34 | void machine_power_off(void) |
38 | { | 35 | { |
39 | if (pm_power_off) | ||
40 | pm_power_off(); | ||
41 | |||
42 | _machine_power_off(); | 36 | _machine_power_off(); |
43 | } | 37 | } |
44 | 38 | ||