Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / inode.c

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index bc844bfe607c8ac8a8716b63bcb07c004e5b9fcb..c53a6763bbbebf7500f4c53e9e1e38ca9806eb15 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 
 #include <asm/byteorder.h>