git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
init_32.c
diff --git
a/arch/x86/mm/init_32.c
b/arch/x86/mm/init_32.c
index
f89b5bb
..
c821074
100644
(file)
--- a/
arch/x86/mm/init_32.c
+++ b/
arch/x86/mm/init_32.c
@@
-45,6
+45,7
@@
#include <asm/bugs.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
#include <asm/bugs.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
+#include <asm/olpc_ofw.h>
#include <asm/pgalloc.h>
#include <asm/sections.h>
#include <asm/paravirt.h>
#include <asm/pgalloc.h>
#include <asm/sections.h>
#include <asm/paravirt.h>
@@
-715,6
+716,7
@@
void __init paging_init(void)
/*
* NOTE: at this point the bootmem allocator is fully available.
*/
/*
* NOTE: at this point the bootmem allocator is fully available.
*/
+ olpc_dt_build_devicetree();
sparse_init();
zone_sizes_init();
}
sparse_init();
zone_sizes_init();
}