diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-09-25 15:47:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-09-25 15:47:12 -0400 |
| commit | 2aee6198652b32e5eaef29a8f8330a9dd15b8efd (patch) | |
| tree | a95da0809e23f506639309d584468edb87f60212 /fs | |
| parent | 402c79fb1944c8e003a32d07f31504b769fe2b52 (diff) | |
| parent | d59952d532ed8fc93ccb98186f73d9ce5cfcb93d (diff) | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 5a5b7116cefb..37310b0e8107 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -3190,6 +3190,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY) | |||
| 3190 | COMPATIBLE_IOCTL(SIOCGIWRETRY) | 3190 | COMPATIBLE_IOCTL(SIOCGIWRETRY) |
| 3191 | COMPATIBLE_IOCTL(SIOCSIWPOWER) | 3191 | COMPATIBLE_IOCTL(SIOCSIWPOWER) |
| 3192 | COMPATIBLE_IOCTL(SIOCGIWPOWER) | 3192 | COMPATIBLE_IOCTL(SIOCGIWPOWER) |
| 3193 | COMPATIBLE_IOCTL(SIOCSIWAUTH) | ||
| 3194 | COMPATIBLE_IOCTL(SIOCGIWAUTH) | ||
| 3193 | /* hiddev */ | 3195 | /* hiddev */ |
| 3194 | COMPATIBLE_IOCTL(HIDIOCGVERSION) | 3196 | COMPATIBLE_IOCTL(HIDIOCGVERSION) |
| 3195 | COMPATIBLE_IOCTL(HIDIOCAPPLICATION) | 3197 | COMPATIBLE_IOCTL(HIDIOCAPPLICATION) |