Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[~andy/linux] / fs / reiserfs / dir.c

diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index 96a2f8889da3a52073805b013cccb6223f706df5..9c23fee3bae9b678d4d3cd6bbca538e07aa3599d 100644 (file)
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -7,7 +7,6 @@
 #include <linux/fs.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/stat.h>
-#include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <asm/uaccess.h>