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/momentum/ocelot_g/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/momentum/ocelot_g/setup.c')
-rw-r--r-- | arch/mips/momentum/ocelot_g/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c index 6336751391c3..fed4e8eee116 100644 --- a/arch/mips/momentum/ocelot_g/setup.c +++ b/arch/mips/momentum/ocelot_g/setup.c | |||
@@ -47,8 +47,10 @@ | |||
47 | #include <linux/sched.h> | 47 | #include <linux/sched.h> |
48 | #include <linux/interrupt.h> | 48 | #include <linux/interrupt.h> |
49 | #include <linux/pci.h> | 49 | #include <linux/pci.h> |
50 | #include <linux/pm.h> | ||
50 | #include <linux/timex.h> | 51 | #include <linux/timex.h> |
51 | #include <linux/vmalloc.h> | 52 | #include <linux/vmalloc.h> |
53 | |||
52 | #include <asm/time.h> | 54 | #include <asm/time.h> |
53 | #include <asm/bootinfo.h> | 55 | #include <asm/bootinfo.h> |
54 | #include <asm/page.h> | 56 | #include <asm/page.h> |
@@ -169,7 +171,7 @@ void __init plat_setup(void) | |||
169 | 171 | ||
170 | _machine_restart = momenco_ocelot_restart; | 172 | _machine_restart = momenco_ocelot_restart; |
171 | _machine_halt = momenco_ocelot_halt; | 173 | _machine_halt = momenco_ocelot_halt; |
172 | _machine_power_off = momenco_ocelot_power_off; | 174 | pm_power_off = momenco_ocelot_power_off; |
173 | 175 | ||
174 | /* | 176 | /* |
175 | * initrd_start = (ulong)ocelot_initrd_start; | 177 | * initrd_start = (ulong)ocelot_initrd_start; |