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
/
cfe
/
setup.c
diff --git
a/arch/mips/sibyte/cfe/setup.c
b/arch/mips/sibyte/cfe/setup.c
index
d6d0364
..
ea30802
100644
(file)
--- a/
arch/mips/sibyte/cfe/setup.c
+++ b/
arch/mips/sibyte/cfe/setup.c
@@
-23,6
+23,7
@@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/bootmem.h>
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/bootmem.h>
+#include <linux/pm.h>
#include <linux/smp.h>
#include <asm/bootinfo.h>
#include <linux/smp.h>
#include <asm/bootinfo.h>
@@
-33,7
+34,7
@@
#include "cfe_error.h"
/* Max ram addressable in 32-bit segments */
#include "cfe_error.h"
/* Max ram addressable in 32-bit segments */
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
#define MAX_RAM_SIZE (~0ULL)
#else
#ifdef CONFIG_HIGHMEM
#define MAX_RAM_SIZE (~0ULL)
#else
#ifdef CONFIG_HIGHMEM
@@
-248,7
+249,7
@@
void __init prom_init(void)
_machine_restart = cfe_linux_restart;
_machine_halt = cfe_linux_halt;
_machine_restart = cfe_linux_restart;
_machine_halt = cfe_linux_halt;
-
_machine
_power_off = cfe_linux_halt;
+
pm
_power_off = cfe_linux_halt;
/*
* Check if a loader was used; if NOT, the 4 arguments are
/*
* Check if a loader was used; if NOT, the 4 arguments are
@@
-285,7
+286,7
@@
void __init prom_init(void)
while (1) ;
}
cfe_init(cfe_handle, cfe_ept);
while (1) ;
}
cfe_init(cfe_handle, cfe_ept);
- /*
+ /*
* Get the handle for (at least) prom_putchar, possibly for
* boot console
*/
* Get the handle for (at least) prom_putchar, possibly for
* boot console
*/