diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-01-18 12:37:07 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-02-07 08:30:22 -0500 |
commit | fcdb27ad1d5c66611d3df6400a9b559186f266fe (patch) | |
tree | 96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/sni/setup.c | |
parent | 9414d3628abb646834965b6c23b8e9064729b110 (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/sni/setup.c')
-rw-r--r-- | arch/mips/sni/setup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 262c85680709..1141fcd13a59 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
6 | * for more details. | 6 | * for more details. |
7 | * | 7 | * |
8 | * Copyright (C) 1996, 97, 98, 2000, 03, 04 Ralf Baechle (ralf@linux-mips.org) | 8 | * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org) |
9 | */ | 9 | */ |
10 | #include <linux/config.h> | 10 | #include <linux/config.h> |
11 | #include <linux/eisa.h> | 11 | #include <linux/eisa.h> |
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
17 | #include <linux/mc146818rtc.h> | 17 | #include <linux/mc146818rtc.h> |
18 | #include <linux/pm.h> | ||
18 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
19 | #include <linux/console.h> | 20 | #include <linux/console.h> |
20 | #include <linux/fb.h> | 21 | #include <linux/fb.h> |
@@ -189,7 +190,7 @@ void __init plat_setup(void) | |||
189 | 190 | ||
190 | _machine_restart = sni_machine_restart; | 191 | _machine_restart = sni_machine_restart; |
191 | _machine_halt = sni_machine_halt; | 192 | _machine_halt = sni_machine_halt; |
192 | _machine_power_off = sni_machine_power_off; | 193 | pm_power_off = sni_machine_power_off; |
193 | 194 | ||
194 | sni_display_setup(); | 195 | sni_display_setup(); |
195 | 196 | ||