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_3 | |
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_3')
-rw-r--r-- | arch/mips/momentum/ocelot_3/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c index c9b7ff8148ec..f95677f4f06f 100644 --- a/arch/mips/momentum/ocelot_3/setup.c +++ b/arch/mips/momentum/ocelot_3/setup.c | |||
@@ -57,6 +57,8 @@ | |||
57 | #include <linux/timex.h> | 57 | #include <linux/timex.h> |
58 | #include <linux/bootmem.h> | 58 | #include <linux/bootmem.h> |
59 | #include <linux/mv643xx.h> | 59 | #include <linux/mv643xx.h> |
60 | #include <linux/pm.h> | ||
61 | |||
60 | #include <asm/time.h> | 62 | #include <asm/time.h> |
61 | #include <asm/page.h> | 63 | #include <asm/page.h> |
62 | #include <asm/bootinfo.h> | 64 | #include <asm/bootinfo.h> |
@@ -321,7 +323,7 @@ void __init plat_setup(void) | |||
321 | 323 | ||
322 | _machine_restart = momenco_ocelot_restart; | 324 | _machine_restart = momenco_ocelot_restart; |
323 | _machine_halt = momenco_ocelot_halt; | 325 | _machine_halt = momenco_ocelot_halt; |
324 | _machine_power_off = momenco_ocelot_power_off; | 326 | pm_power_off = momenco_ocelot_power_off; |
325 | 327 | ||
326 | /* Wired TLB entries */ | 328 | /* Wired TLB entries */ |
327 | setup_wired_tlb_entries(); | 329 | setup_wired_tlb_entries(); |