Merge branch 'akpm' (patches from Andrew)

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index e82171b99874c9e93138dde45a132634a423fbb0..a7e969d12f51a8a629f74d7bf10920ea7fef967b 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -80,6 +80,7 @@
 #include <linux/list.h>
 #include <linux/integrity.h>
 #include <linux/proc_ns.h>
+#include <linux/io.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -485,6 +486,7 @@ static void __init mm_init(void)
        percpu_init_late();
        pgtable_init();
        vmalloc_init();
+       ioremap_huge_init();
 }
 
 asmlinkage __visible void __init start_kernel(void)