diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 12:40:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 12:40:43 +1000 |
| commit | 6cdefbbd7eecfc4d566ab6293f70cc84062b7fab (patch) | |
| tree | 995a2f1a872dd2c484a826ef8ddfc54e662658d2 | |
| parent | f6709ae190830bad234c5414988db7a56e9cf0ac (diff) | |
| parent | d5724956283b0abe89ea828cfc43b6f0715c5568 (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 |