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 /include | |
| parent | 4c619407b0439c59c20398b9459020c0d297f424 (diff) | |
| parent | 5ef06839f50c7e5e479d3595257131edf1f84f36 (diff) | |
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 'include')
| -rw-r--r-- | include/linux/auto_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index 7b09c8348fd3..da64e15004b6 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h @@ -79,6 +79,7 @@ struct autofs_packet_expire { #define AUTOFS_IOC_FAIL _IO(0x93,0x61) #define AUTOFS_IOC_CATATONIC _IO(0x93,0x62) #define AUTOFS_IOC_PROTOVER _IOR(0x93,0x63,int) +#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,compat_ulong_t) #define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long) #define AUTOFS_IOC_EXPIRE _IOR(0x93,0x65,struct autofs_packet_expire) |