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 | |
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')
-rw-r--r-- | arch/mips/momentum/jaguar_atx/setup.c | 3 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_3/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_c/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_g/setup.c | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index bab192ddc185..301d67226d72 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/pci.h> | 50 | #include <linux/pci.h> |
51 | #include <linux/swap.h> | 51 | #include <linux/swap.h> |
52 | #include <linux/ioport.h> | 52 | #include <linux/ioport.h> |
53 | #include <linux/pm.h> | ||
53 | #include <linux/sched.h> | 54 | #include <linux/sched.h> |
54 | #include <linux/interrupt.h> | 55 | #include <linux/interrupt.h> |
55 | #include <linux/timex.h> | 56 | #include <linux/timex.h> |
@@ -365,7 +366,7 @@ void __init plat_setup(void) | |||
365 | 366 | ||
366 | _machine_restart = momenco_jaguar_restart; | 367 | _machine_restart = momenco_jaguar_restart; |
367 | _machine_halt = momenco_jaguar_halt; | 368 | _machine_halt = momenco_jaguar_halt; |
368 | _machine_power_off = momenco_jaguar_power_off; | 369 | pm_power_off = momenco_jaguar_power_off; |
369 | 370 | ||
370 | /* | 371 | /* |
371 | * initrd_start = (ulong)jaguar_initrd_start; | 372 | * initrd_start = (ulong)jaguar_initrd_start; |
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(); |
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c index 2755c1547473..15998d8a9341 100644 --- a/arch/mips/momentum/ocelot_c/setup.c +++ b/arch/mips/momentum/ocelot_c/setup.c | |||
@@ -51,8 +51,10 @@ | |||
51 | #include <linux/sched.h> | 51 | #include <linux/sched.h> |
52 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
53 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
54 | #include <linux/pm.h> | ||
54 | #include <linux/timex.h> | 55 | #include <linux/timex.h> |
55 | #include <linux/vmalloc.h> | 56 | #include <linux/vmalloc.h> |
57 | |||
56 | #include <asm/time.h> | 58 | #include <asm/time.h> |
57 | #include <asm/bootinfo.h> | 59 | #include <asm/bootinfo.h> |
58 | #include <asm/page.h> | 60 | #include <asm/page.h> |
@@ -236,7 +238,7 @@ void __init plat_setup(void) | |||
236 | 238 | ||
237 | _machine_restart = momenco_ocelot_restart; | 239 | _machine_restart = momenco_ocelot_restart; |
238 | _machine_halt = momenco_ocelot_halt; | 240 | _machine_halt = momenco_ocelot_halt; |
239 | _machine_power_off = momenco_ocelot_power_off; | 241 | pm_power_off = momenco_ocelot_power_off; |
240 | 242 | ||
241 | /* | 243 | /* |
242 | * initrd_start = (ulong)ocelot_initrd_start; | 244 | * initrd_start = (ulong)ocelot_initrd_start; |
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; |