diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:59:34 -0500 |
commit | 725b2805fd5d729b0db59fe8fc992e97523782c7 (patch) | |
tree | 04ca7c7ed6e918029898a6c5301488e60d0564d4 /arch/mips/ite-boards/generic | |
parent | 9ac341ae799413708e674bc65c8a72c90dae8d34 (diff) | |
parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/mips/ite-boards/generic')
-rw-r--r-- | arch/mips/ite-boards/generic/it8172_setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c index 062429dd7ca0..fc73c8d69df7 100644 --- a/arch/mips/ite-boards/generic/it8172_setup.c +++ b/arch/mips/ite-boards/generic/it8172_setup.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/major.h> | 34 | #include <linux/major.h> |
35 | #include <linux/kdev_t.h> | 35 | #include <linux/kdev_t.h> |
36 | #include <linux/root_dev.h> | 36 | #include <linux/root_dev.h> |
37 | #include <linux/pm.h> | ||
37 | 38 | ||
38 | #include <asm/cpu.h> | 39 | #include <asm/cpu.h> |
39 | #include <asm/time.h> | 40 | #include <asm/time.h> |
@@ -125,7 +126,7 @@ void __init plat_setup(void) | |||
125 | 126 | ||
126 | _machine_restart = it8172_restart; | 127 | _machine_restart = it8172_restart; |
127 | _machine_halt = it8172_halt; | 128 | _machine_halt = it8172_halt; |
128 | _machine_power_off = it8172_power_off; | 129 | pm_power_off = it8172_power_off; |
129 | 130 | ||
130 | /* | 131 | /* |
131 | * IO/MEM resources. | 132 | * IO/MEM resources. |