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
/
pmc-sierra
/
yosemite
/
prom.c
diff --git
a/arch/mips/pmc-sierra/yosemite/prom.c
b/arch/mips/pmc-sierra/yosemite/prom.c
index
1fb3e69
..
165275c
100644
(file)
--- a/
arch/mips/pmc-sierra/yosemite/prom.c
+++ b/
arch/mips/pmc-sierra/yosemite/prom.c
@@
-13,6
+13,7
@@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/delay.h>
+#include <linux/pm.h>
#include <linux/smp.h>
#include <asm/io.h>
#include <linux/smp.h>
#include <asm/io.h>
@@
-92,7
+93,7
@@
void __init prom_init(void)
/* Callbacks for halt, restart */
_machine_restart = (void (*)(char *)) prom_exit;
_machine_halt = prom_halt;
/* Callbacks for halt, restart */
_machine_restart = (void (*)(char *)) prom_exit;
_machine_halt = prom_halt;
-
_machine
_power_off = prom_halt;
+
pm
_power_off = prom_halt;
debug_vectors = cv;
arcs_cmdline[0] = '\0';
debug_vectors = cv;
arcs_cmdline[0] = '\0';
@@
-132,8
+133,9
@@
void __init prom_init(void)
prom_grab_secondary();
}
prom_grab_secondary();
}
-
void
__init prom_free_prom_memory(void)
+
unsigned long
__init prom_free_prom_memory(void)
{
{
+ return 0;
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
}
void __init prom_fixup_mem_map(unsigned long start, unsigned long end)