diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-19 09:30:39 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-19 09:30:39 +0200 |
commit | 407d819cf0fd54c6fc1138a509225696aecafd15 (patch) | |
tree | b653a5c8c09f7c316f5f98947be262e27a4ca33a /fs/compat_ioctl.c | |
parent | ipv6: remove unused macros from net/ipv6.h (diff) | |
parent | [Bluetooth] Allow security for outgoing L2CAP connections (diff) | |
download | linux-407d819cf0fd54c6fc1138a509225696aecafd15.tar.xz linux-407d819cf0fd54c6fc1138a509225696aecafd15.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'fs/compat_ioctl.c')
-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 ddefb8851a98..7b3a03c7c6a9 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -2346,6 +2346,7 @@ COMPATIBLE_IOCTL(HCIGETDEVLIST) COMPATIBLE_IOCTL(HCIGETDEVINFO) COMPATIBLE_IOCTL(HCIGETCONNLIST) COMPATIBLE_IOCTL(HCIGETCONNINFO) +COMPATIBLE_IOCTL(HCIGETAUTHINFO) COMPATIBLE_IOCTL(HCISETRAW) COMPATIBLE_IOCTL(HCISETSCAN) COMPATIBLE_IOCTL(HCISETAUTH) |