summaryrefslogtreecommitdiffstats
path: root/arch/mips/cobalt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-01-18 17:37:07 +0000
committerRalf Baechle <ralf@linux-mips.org>2006-02-07 13:30:22 +0000
commitfcdb27ad1d5c66611d3df6400a9b559186f266fe (patch)
tree96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/cobalt
parent9414d3628abb646834965b6c23b8e9064729b110 (diff)
downloadblackbird-op-linux-fcdb27ad1d5c66611d3df6400a9b559186f266fe.tar.gz
blackbird-op-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/cobalt')
-rw-r--r--arch/mips/cobalt/setup.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index d358a118fa31..f9cf1554b234 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -5,7 +5,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1996, 1997, 2004 by Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org)
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
*
*/
@@ -13,6 +13,7 @@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/pm.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
@@ -99,7 +100,7 @@ void __init plat_setup(void)
_machine_restart = cobalt_machine_restart;
_machine_halt = cobalt_machine_halt;
- _machine_power_off = cobalt_machine_power_off;
+ pm_power_off = cobalt_machine_power_off;
board_timer_setup = cobalt_timer_setup;
OpenPOWER on IntegriCloud