diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:42 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:47 +0100 |
commit | e4e91ac410356da3a518188f371e9d3b52ee38ee (patch) | |
tree | e1b33743a08847030285d34bcb2eb8ba90f30a0c /fs/ncpfs/inode.c | |
parent | ea7872b9d6a81101f6ba0ec141544a62fea35876 (diff) | |
parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ncpfs/inode.c')
-rw-r--r-- | fs/ncpfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index d290545aa0c..8fb93b604e7 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c @@ -26,7 +26,6 @@ #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/vfs.h> #include <linux/mount.h> #include <linux/seq_file.h> |