Merge branches 'release' and 'dmi' into release

[sfrench/cifs-2.6.git] / fs / ext2 / xattr_trusted.c

diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
index f28a6a499c9650bb6d612947d9b78ff7650151db..83ee149f353db383d657e01a5feb8cd0fac82655 100644 (file)
--- a/fs/ext2/xattr_trusted.c
+++ b/fs/ext2/xattr_trusted.c
@@ -9,7 +9,6 @@
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
 #include <linux/ext2_fs.h>
 #include "xattr.h"