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/ddb5xxx | |
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/ddb5xxx')
-rw-r--r-- | arch/mips/ddb5xxx/ddb5074/setup.c | 3 | ||||
-rw-r--r-- | arch/mips/ddb5xxx/ddb5476/setup.c | 3 | ||||
-rw-r--r-- | arch/mips/ddb5xxx/ddb5477/setup.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/ddb5xxx/ddb5074/setup.c b/arch/mips/ddb5xxx/ddb5074/setup.c index 11535be265b9..91456b068c2e 100644 --- a/arch/mips/ddb5xxx/ddb5074/setup.c +++ b/arch/mips/ddb5xxx/ddb5074/setup.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/ide.h> | 14 | #include <linux/ide.h> |
15 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <linux/pm.h> | ||
17 | 18 | ||
18 | #include <asm/addrspace.h> | 19 | #include <asm/addrspace.h> |
19 | #include <asm/bcache.h> | 20 | #include <asm/bcache.h> |
@@ -95,7 +96,7 @@ void __init plat_setup(void) | |||
95 | 96 | ||
96 | _machine_restart = ddb_machine_restart; | 97 | _machine_restart = ddb_machine_restart; |
97 | _machine_halt = ddb_machine_halt; | 98 | _machine_halt = ddb_machine_halt; |
98 | _machine_power_off = ddb_machine_power_off; | 99 | pm_power_off = ddb_machine_power_off; |
99 | 100 | ||
100 | ddb_out32(DDB_BAR0, 0); | 101 | ddb_out32(DDB_BAR0, 0); |
101 | 102 | ||
diff --git a/arch/mips/ddb5xxx/ddb5476/setup.c b/arch/mips/ddb5xxx/ddb5476/setup.c index f4e480a74edf..c902adef5942 100644 --- a/arch/mips/ddb5xxx/ddb5476/setup.c +++ b/arch/mips/ddb5xxx/ddb5476/setup.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/pm.h> | ||
14 | 15 | ||
15 | #include <asm/addrspace.h> | 16 | #include <asm/addrspace.h> |
16 | #include <asm/bcache.h> | 17 | #include <asm/bcache.h> |
@@ -133,7 +134,7 @@ void __init plat_setup(void) | |||
133 | 134 | ||
134 | _machine_restart = ddb_machine_restart; | 135 | _machine_restart = ddb_machine_restart; |
135 | _machine_halt = ddb_machine_halt; | 136 | _machine_halt = ddb_machine_halt; |
136 | _machine_power_off = ddb_machine_power_off; | 137 | pm_power_off = ddb_machine_power_off; |
137 | 138 | ||
138 | /* request io port/mem resources */ | 139 | /* request io port/mem resources */ |
139 | if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) || | 140 | if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) || |
diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c index 81163353c4a8..2f566034cc44 100644 --- a/arch/mips/ddb5xxx/ddb5477/setup.c +++ b/arch/mips/ddb5xxx/ddb5477/setup.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/major.h> | 26 | #include <linux/major.h> |
27 | #include <linux/kdev_t.h> | 27 | #include <linux/kdev_t.h> |
28 | #include <linux/root_dev.h> | 28 | #include <linux/root_dev.h> |
29 | #include <linux/pm.h> | ||
29 | 30 | ||
30 | #include <asm/cpu.h> | 31 | #include <asm/cpu.h> |
31 | #include <asm/bootinfo.h> | 32 | #include <asm/bootinfo.h> |
@@ -182,7 +183,7 @@ void __init plat_setup(void) | |||
182 | 183 | ||
183 | _machine_restart = ddb_machine_restart; | 184 | _machine_restart = ddb_machine_restart; |
184 | _machine_halt = ddb_machine_halt; | 185 | _machine_halt = ddb_machine_halt; |
185 | _machine_power_off = ddb_machine_power_off; | 186 | pm_power_off = ddb_machine_power_off; |
186 | 187 | ||
187 | /* setup resource limits */ | 188 | /* setup resource limits */ |
188 | ioport_resource.end = DDB_PCI0_IO_SIZE + DDB_PCI1_IO_SIZE - 1; | 189 | ioport_resource.end = DDB_PCI0_IO_SIZE + DDB_PCI1_IO_SIZE - 1; |