Merge commit 'v3.1-rc1' into imx-fixes

[mv-sheeva.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index 52501b5d4902b5842f81c83e78b7e6b46652b314..0a1355ca3d7927145d12bfeff3b62db138ccf124 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -43,7 +43,7 @@
 
 #include <linux/init.h>
 #include <asm/types.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/slab.h>