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
/
sibyte
/
sb1250
/
prom.c
diff --git
a/arch/mips/sibyte/sb1250/prom.c
b/arch/mips/sibyte/sb1250/prom.c
index
de62ab0
..
742043f
100644
(file)
--- a/
arch/mips/sibyte/sb1250/prom.c
+++ b/
arch/mips/sibyte/sb1250/prom.c
@@
-24,6
+24,7
@@
#include <linux/bootmem.h>
#include <linux/smp.h>
#include <linux/initrd.h>
#include <linux/bootmem.h>
#include <linux/smp.h>
#include <linux/initrd.h>
+#include <linux/pm.h>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
#include <asm/bootinfo.h>
#include <asm/reboot.h>
@@
-79,7
+80,7
@@
void __init prom_init(void)
{
_machine_restart = (void (*)(char *))prom_linux_exit;
_machine_halt = prom_linux_exit;
{
_machine_restart = (void (*)(char *))prom_linux_exit;
_machine_halt = prom_linux_exit;
-
_machine
_power_off = prom_linux_exit;
+
pm
_power_off = prom_linux_exit;
strcpy(arcs_cmdline, "root=/dev/ram0 ");
strcpy(arcs_cmdline, "root=/dev/ram0 ");