diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 13:58:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 13:58:28 -0700 |
| commit | 7233e392760b3493095d3d5885cb15e44493d74a (patch) | |
| tree | e2095425fe34c635ee2cf77f9ef6022f7cddfbb1 /fs/ncpfs | |
| parent | 4c619407b0439c59c20398b9459020c0d297f424 (diff) | |
| parent | 5ef06839f50c7e5e479d3595257131edf1f84f36 (diff) | |
| download | linux-3.10-7233e392760b3493095d3d5885cb15e44493d74a.tar.gz linux-3.10-7233e392760b3493095d3d5885cb15e44493d74a.tar.bz2 linux-3.10-7233e392760b3493095d3d5885cb15e44493d74a.zip | |
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
staging: Pushdown bkl to easycap ioctl handlers
autofs/autofs4: Move compat_ioctl handling into fs
v4l: Convert v4l2-dev to unlocked_ioctl
ia64/perfmon: Convert to unlocked_ioctl
sunrpc: Remove duplicated #include
ncpfs: Remove duplicated #include
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 023c03d0207..84a8cfc4e38 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> |