diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-16 04:21:39 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-16 04:21:39 +0000 |
| commit | f6c43385435640e056424034caac0d765c45e370 (patch) | |
| tree | 54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /fs/nfs/file.c | |
| parent | 65bc98b0059360e458aebd208587be44641227c1 (diff) | |
| parent | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 0055b813ec2..05062329b67 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -26,7 +26,6 @@ #include <linux/mm.h> #include <linux/slab.h> #include <linux/pagemap.h> -#include <linux/smp_lock.h> #include <linux/aio.h> #include <asm/uaccess.h> |