diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 14:50:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 14:50:30 +1000 |
| commit | acf42066ed697e97f59ffbd84cddfa15c5d3b169 (patch) | |
| tree | 3553d8ddf0322cd4df716cc6bb188859d595906e | |
| parent | 4e4d103f547db702436f0b4883e99ad1910ad594 (diff) | |
| parent | 29f367bfbf5a8de46cb7320647e44f20d18cff44 (diff) | |
Merge remote branch 'bkl-ioctl/bkl/ioctl'
| -rw-r--r-- | fs/ncpfs/ioctl.c | 1 | ||||
| -rw-r--r-- | net/sunrpc/cache.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 023c03d02070..84a8cfc4e38e 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c @@ -20,7 +20,6 @@ #include <linux/smp_lock.h> #include <linux/vmalloc.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/ncp_fs.h> diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 939d048ef92b..2b06410e584e 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -34,7 +34,6 @@ #include <linux/sunrpc/cache.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/rpc_pipe_fs.h> -#include <linux/smp_lock.h> #define RPCDBG_FACILITY RPCDBG_CACHE |