Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / fs / ext3 / resize.c

diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index ecf89904c1134800e609486cee2c74ff489e1f90..2c97e09c6c6b2a3048898f69d76cb0522061f389 100644 (file)
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -11,7 +11,6 @@
 
 #define EXT3FS_DEBUG
 
-#include <linux/smp_lock.h>
 #include <linux/ext3_jbd.h>
 
 #include <linux/errno.h>