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/pmc-sierra/yosemite/prom.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/pmc-sierra/yosemite/prom.c')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/prom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c index 555bfacf7647..165275c00cbb 100644 --- a/arch/mips/pmc-sierra/yosemite/prom.c +++ b/arch/mips/pmc-sierra/yosemite/prom.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include <linux/pm.h> | ||
16 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
17 | 18 | ||
18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
@@ -92,7 +93,7 @@ void __init prom_init(void) | |||
92 | /* Callbacks for halt, restart */ | 93 | /* Callbacks for halt, restart */ |
93 | _machine_restart = (void (*)(char *)) prom_exit; | 94 | _machine_restart = (void (*)(char *)) prom_exit; |
94 | _machine_halt = prom_halt; | 95 | _machine_halt = prom_halt; |
95 | _machine_power_off = prom_halt; | 96 | pm_power_off = prom_halt; |
96 | 97 | ||
97 | debug_vectors = cv; | 98 | debug_vectors = cv; |
98 | arcs_cmdline[0] = '\0'; | 99 | arcs_cmdline[0] = '\0'; |