Merge tag 'v3.10.59' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / init-mm.c

diff --git a/mm/init-mm.c b/mm/init-mm.c
index 4019979b263722098b8231391e9a7ae82dc153f6..a56a851908d245248803a602f68d5833cf1f8412 100644 (file)
--- a/mm/init-mm.c
+++ b/mm/init-mm.c
@@ -5,7 +5,7 @@
 #include <linux/list.h>
 #include <linux/cpumask.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/pgtable.h>
 #include <asm/mmu.h>