Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[linux-flexiantxendom0-3.2.10.git] / mm / mm_init.c

diff --git a/mm/mm_init.c b/mm/mm_init.c
index 936ef2e..1ffd97a 100644 (file)
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -8,11 +8,11 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/kobject.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include "internal.h"
 
 #ifdef CONFIG_DEBUG_MEMORY_INIT
-int __meminitdata mminit_loglevel;
+int mminit_loglevel;
 
 #ifndef SECTIONS_SHIFT
 #define SECTIONS_SHIFT 0