Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index 898669732466..cfa7d3456634 100644
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -31,6 +31,7 @@
 #include <asm/vaddrs.h>
 #include <asm/pgalloc.h>        /* bug in asm-generic/tlb.h: check_pgt_cache */
 #include <asm/tlb.h>
+#include <asm/prom.h>
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
@@ -349,6 +350,7 @@ void __init paging_init(void)
         protection_map[14] = PAGE_SHARED;
         protection_map[15] = PAGE_SHARED;
         btfixup();
+        prom_build_devicetree();
         device_scan();
 }