summaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/generic/reset.c
diff options
context:
space:
mode:
authorRalf Baechle2006-01-18 18:37:07 +0100
committerRalf Baechle2006-02-07 14:30:22 +0100
commitfcdb27ad1d5c66611d3df6400a9b559186f266fe (patch)
tree96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/mips-boards/generic/reset.c
parent[MIPS] Check function pointers are non-zero before calling. (diff)
downloadkernel-qcow2-linux-fcdb27ad1d5c66611d3df6400a9b559186f266fe.tar.gz
kernel-qcow2-linux-fcdb27ad1d5c66611d3df6400a9b559186f266fe.tar.xz
kernel-qcow2-linux-fcdb27ad1d5c66611d3df6400a9b559186f266fe.zip
[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/generic/reset.c')
-rw-r--r--arch/mips/mips-boards/generic/reset.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c
index 9fdec743bd95..7213c395fb6b 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mips-boards/generic/reset.c
@@ -23,6 +23,7 @@
*
*/
#include <linux/config.h>
+#include <linux/pm.h>
#include <asm/io.h>
#include <asm/reboot.h>
@@ -65,9 +66,9 @@ void mips_reboot_setup(void)
_machine_restart = mips_machine_restart;
_machine_halt = mips_machine_halt;
#if defined(CONFIG_MIPS_ATLAS)
- _machine_power_off = atlas_machine_power_off;
+ pm_power_off = atlas_machine_power_off;
#endif
#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD)
- _machine_power_off = mips_machine_halt;
+ pm_power_off = mips_machine_halt;
#endif
}