summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid S. Miller2008-07-19 09:30:39 +0200
committerDavid S. Miller2008-07-19 09:30:39 +0200
commit407d819cf0fd54c6fc1138a509225696aecafd15 (patch)
treeb653a5c8c09f7c316f5f98947be262e27a4ca33a /fs
parentipv6: remove unused macros from net/ipv6.h (diff)
parent[Bluetooth] Allow security for outgoing L2CAP connections (diff)
downloadkernel-qcow2-linux-407d819cf0fd54c6fc1138a509225696aecafd15.tar.gz
kernel-qcow2-linux-407d819cf0fd54c6fc1138a509225696aecafd15.tar.xz
kernel-qcow2-linux-407d819cf0fd54c6fc1138a509225696aecafd15.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'fs')
-rw-r--r--fs/compat_ioctl.c1
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)