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/tx4927/toshiba_rbtx4927 | |
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/tx4927/toshiba_rbtx4927')
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index 990fcb294bab..098132916cc8 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -53,6 +53,8 @@ | |||
53 | #include <linux/interrupt.h> | 53 | #include <linux/interrupt.h> |
54 | #include <linux/pci.h> | 54 | #include <linux/pci.h> |
55 | #include <linux/timex.h> | 55 | #include <linux/timex.h> |
56 | #include <linux/pm.h> | ||
57 | |||
56 | #include <asm/bootinfo.h> | 58 | #include <asm/bootinfo.h> |
57 | #include <asm/page.h> | 59 | #include <asm/page.h> |
58 | #include <asm/io.h> | 60 | #include <asm/io.h> |
@@ -814,7 +816,7 @@ void __init toshiba_rbtx4927_setup(void) | |||
814 | ":ResetRoutines\n"); | 816 | ":ResetRoutines\n"); |
815 | _machine_restart = toshiba_rbtx4927_restart; | 817 | _machine_restart = toshiba_rbtx4927_restart; |
816 | _machine_halt = toshiba_rbtx4927_halt; | 818 | _machine_halt = toshiba_rbtx4927_halt; |
817 | _machine_power_off = toshiba_rbtx4927_power_off; | 819 | pm_power_off = toshiba_rbtx4927_power_off; |
818 | 820 | ||
819 | #ifdef CONFIG_PCI | 821 | #ifdef CONFIG_PCI |
820 | 822 | ||