aboutsummaryrefslogtreecommitdiffstats
path: root/fs/compat_ioctl.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-02 00:35:16 -0500
committerDavid S. Miller <davem@davemloft.net>2009-03-02 00:35:16 -0500
commitaa4abc9bcce0d2a7ec189e897f8f8c58ca04643b (patch)
tree22ef88d84a2e06380bb6a853c3ba28657e4e5f92 /fs/compat_ioctl.c
parent814c01dc7c533033b4e99981a2e24a6195bfb43c (diff)
parent52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c net/8021q/vlan_core.c net/core/dev.c
Diffstat (limited to 'fs/compat_ioctl.c')
-rw-r--r--fs/compat_ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 4ea8a98b23df..ff786687e93b 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1918,6 +1918,9 @@ COMPATIBLE_IOCTL(FIONREAD) /* This is also TIOCINQ */
1918/* 0x00 */ 1918/* 0x00 */
1919COMPATIBLE_IOCTL(FIBMAP) 1919COMPATIBLE_IOCTL(FIBMAP)
1920COMPATIBLE_IOCTL(FIGETBSZ) 1920COMPATIBLE_IOCTL(FIGETBSZ)
1921/* 'X' - originally XFS but some now in the VFS */
1922COMPATIBLE_IOCTL(FIFREEZE)
1923COMPATIBLE_IOCTL(FITHAW)
1921/* RAID */ 1924/* RAID */
1922COMPATIBLE_IOCTL(RAID_VERSION) 1925COMPATIBLE_IOCTL(RAID_VERSION)
1923COMPATIBLE_IOCTL(GET_ARRAY_INFO) 1926COMPATIBLE_IOCTL(GET_ARRAY_INFO)