Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-drm-fsl-dcu.git] / fs / attr.c

diff --git a/fs/attr.c b/fs/attr.c
index 97de946708781df074388be1da5e4f811872766a..a0a0c7b07ba3908379d311931254cc5ba9b2d014 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -9,7 +9,6 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/capability.h>
 #include <linux/fsnotify.h>
 #include <linux/fcntl.h>