diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
| commit | 42a9fa9957e369240936891c9a521ab671eed4e7 (patch) | |
| tree | 7a9367594a367085c6a4a4433f687ec5c8dac8b7 /arch/x86/mm/init_32.c | |
| parent | spi: Enable SPI driver for S5P6440 and S5P6450 (diff) | |
| parent | mmc: sdhci-of: fix build on non-powerpc platforms (diff) | |
| download | linux-42a9fa9957e369240936891c9a521ab671eed4e7.tar.xz linux-42a9fa9957e369240936891c9a521ab671eed4e7.zip | |
Merge branch 'devicetree/next' into spi/next
Diffstat (limited to 'arch/x86/mm/init_32.c')
| -rw-r--r-- | arch/x86/mm/init_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index f89b5bb4e93f..c821074b7f0b 100644 --- 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/olpc_ofw.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. */ + olpc_dt_build_devicetree(); sparse_init(); zone_sizes_init(); } |