git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
mips-boards
/
generic
/
reset.c
diff --git
a/arch/mips/mips-boards/generic/reset.c
b/arch/mips/mips-boards/generic/reset.c
index
9fdec74
..
7213c39
100644
(file)
--- a/
arch/mips/mips-boards/generic/reset.c
+++ b/
arch/mips/mips-boards/generic/reset.c
@@
-23,6
+23,7
@@
*
*/
#include <linux/config.h>
*
*/
#include <linux/config.h>
+#include <linux/pm.h>
#include <asm/io.h>
#include <asm/reboot.h>
#include <asm/io.h>
#include <asm/reboot.h>
@@
-65,9
+66,9
@@
void mips_reboot_setup(void)
_machine_restart = mips_machine_restart;
_machine_halt = mips_machine_halt;
#if defined(CONFIG_MIPS_ATLAS)
_machine_restart = mips_machine_restart;
_machine_halt = mips_machine_halt;
#if defined(CONFIG_MIPS_ATLAS)
-
_machine
_power_off = atlas_machine_power_off;
+
pm
_power_off = atlas_machine_power_off;
#endif
#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD)
#endif
#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD)
-
_machine
_power_off = mips_machine_halt;
+
pm
_power_off = mips_machine_halt;
#endif
}
#endif
}