Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[karo-tx-linux.git] / fs / gfs2 / main.c

diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 29e1ace7953d619b707e461e0da8a1ac61f6d167..8a139ff1919f922bdf20b3f2d933316a1560b5f8 100644 (file)
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -16,7 +16,7 @@
 #include <linux/gfs2_ondisk.h>
 #include <linux/rcupdate.h>
 #include <linux/rculist_bl.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #include "gfs2.h"
 #include "incore.h"