Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

[linux-2.6] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index afb21ea45302a728936a27dc1b568e9eb04c1186..b6f12593c39dd76a1cd2002c93466a9370f04957 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -53,7 +53,6 @@
 #include <linux/string.h>
 #include <linux/pagemap.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <linux/quotaops.h>