summaryrefslogtreecommitdiff
path: root/include/linux/compat_ioctl.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-03-21 06:53:33 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2004-03-21 06:53:33 -0800
commit2650e5a89b4b316bacb95bf0c0f4f3362224bf89 (patch)
treeacea6cf2dafb188a31dc19220a522d8a927ae4e2 /include/linux/compat_ioctl.h
parent4f51388a570b4f490283186867c844f403abf84f (diff)
parentd3b7acb2f0c06cfd36aafebf72b255d29a723b1a (diff)
Merge http://linux-mh.bkbits.net/bluetooth-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux/compat_ioctl.h')
-rw-r--r--include/linux/compat_ioctl.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h
index 7f06e2b30abc..fabf0f345a17 100644
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
@@ -618,6 +618,10 @@ COMPATIBLE_IOCTL(BNEPCONNADD)
COMPATIBLE_IOCTL(BNEPCONNDEL)
COMPATIBLE_IOCTL(BNEPGETCONNLIST)
COMPATIBLE_IOCTL(BNEPGETCONNINFO)
+COMPATIBLE_IOCTL(CMTPCONNADD)
+COMPATIBLE_IOCTL(CMTPCONNDEL)
+COMPATIBLE_IOCTL(CMTPGETCONNLIST)
+COMPATIBLE_IOCTL(CMTPGETCONNINFO)
/* Misc. */
COMPATIBLE_IOCTL(0x41545900) /* ATYIO_CLKR */
COMPATIBLE_IOCTL(0x41545901) /* ATYIO_CLKW */