Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[pandora-kernel.git] / fs / jfs / jfs_txnmgr.c

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 9b3de0a..25430d0 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -44,7 +44,6 @@
 
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
 
 #include <linux/fs.h>
 #include <linux/vmalloc.h>

-#include <linux/smp_lock.h>

 #include <linux/completion.h>
 #include <linux/freezer.h>
 #include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/freezer.h>
 #include <linux/module.h>