Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mv-sheeva.git] / fs / ntfs / inode.c

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index f8bf8da67ee8f86bb0813b231f55ddbfc5148a46..074791ce4ab27fda0ae007f491662ac5ec95b2a7 100644 (file)
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -27,7 +27,6 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 
 #include "aops.h"
 #include "attrib.h"