aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi-ip22
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-01-18 12:37:07 -0500
committerRalf Baechle <ralf@linux-mips.org>2006-02-07 08:30:22 -0500
commitfcdb27ad1d5c66611d3df6400a9b559186f266fe (patch)
tree96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/sgi-ip22
parent9414d3628abb646834965b6c23b8e9064729b110 (diff)
[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/sgi-ip22')
-rw-r--r--arch/mips/sgi-ip22/ip22-reset.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 71b934318d56..92a3b3c15ed3 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -3,7 +3,7 @@
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 1997, 1998, 2001, 03, 05 by Ralf Baechle 6 * Copyright (C) 1997, 1998, 2001, 03, 05, 06 by Ralf Baechle
7 */ 7 */
8#include <linux/linkage.h> 8#include <linux/linkage.h>
9#include <linux/init.h> 9#include <linux/init.h>
@@ -13,6 +13,7 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/sched.h> 14#include <linux/sched.h>
15#include <linux/notifier.h> 15#include <linux/notifier.h>
16#include <linux/pm.h>
16#include <linux/timer.h> 17#include <linux/timer.h>
17 18
18#include <asm/io.h> 19#include <asm/io.h>
@@ -232,7 +233,7 @@ static int __init reboot_setup(void)
232{ 233{
233 _machine_restart = sgi_machine_restart; 234 _machine_restart = sgi_machine_restart;
234 _machine_halt = sgi_machine_halt; 235 _machine_halt = sgi_machine_halt;
235 _machine_power_off = sgi_machine_power_off; 236 pm_power_off = sgi_machine_power_off;
236 237
237 request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL); 238 request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL);
238 init_timer(&blink_timer); 239 init_timer(&blink_timer);