projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
setup.c
diff --git
a/arch/mips/kernel/setup.c
b/arch/mips/kernel/setup.c
index
85aef3f
..
a6b900f
100644
(file)
--- a/
arch/mips/kernel/setup.c
+++ b/
arch/mips/kernel/setup.c
@@
-31,6
+31,7
@@
#include <asm/setup.h>
#include <asm/smp-ops.h>
#include <asm/system.h>
+#include <asm/prom.h>
struct cpuinfo_mips cpu_data[NR_CPUS] __read_mostly;
@@
-487,6
+488,7
@@
static void __init arch_mem_init(char **cmdline_p)
}
bootmem_init();
+ device_tree_init();
sparse_init();
paging_init();
}