diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 03:10:35 -0200 |
commit | fc228a04a4c01bbb2f898e180a14f9a976001f79 (patch) | |
tree | c6015f399aac7f0566dfadb984d843fe67175329 /fs | |
parent | 9fcc2e8a752f7d3d889114221b67c459557823e9 (diff) | |
parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) | |
download | linux-fc228a04a4c01bbb2f898e180a14f9a976001f79.tar.bz2 |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs')
-rw-r--r-- | fs/compat_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index e28a74203f3b..a327e03753ac 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -3050,6 +3050,7 @@ HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl) HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control) HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk) HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal) +COMPATIBLE_IOCTL(USBDEVFS_IOCTL32) /* i2c */ HANDLE_IOCTL(I2C_FUNCS, w_long) HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl) |