aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/ioctl/ioctl-number.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/ioctl/ioctl-number.txt')
-rw-r--r--Documentation/ioctl/ioctl-number.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 7bb0d934b6d8..aafca0a8f66a 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -121,6 +121,7 @@ Code Seq# Include File Comments
121'c' 00-7F linux/comstats.h conflict! 121'c' 00-7F linux/comstats.h conflict!
122'c' 00-7F linux/coda.h conflict! 122'c' 00-7F linux/coda.h conflict!
123'c' 80-9F arch/s390/include/asm/chsc.h 123'c' 80-9F arch/s390/include/asm/chsc.h
124'c' A0-AF arch/x86/include/asm/msr.h
124'd' 00-FF linux/char/drm/drm/h conflict! 125'd' 00-FF linux/char/drm/drm/h conflict!
125'd' F0-FF linux/digi1.h 126'd' F0-FF linux/digi1.h
126'e' all linux/digi1.h conflict! 127'e' all linux/digi1.h conflict!
@@ -139,6 +140,7 @@ Code Seq# Include File Comments
139'm' all linux/synclink.h conflict! 140'm' all linux/synclink.h conflict!
140'm' 00-1F net/irda/irmod.h conflict! 141'm' 00-1F net/irda/irmod.h conflict!
141'n' 00-7F linux/ncp_fs.h 142'n' 00-7F linux/ncp_fs.h
143'n' 80-8F linux/nilfs2_fs.h NILFS2
142'n' E0-FF video/matrox.h matroxfb 144'n' E0-FF video/matrox.h matroxfb
143'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 145'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2
144'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) 146'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)
@@ -191,7 +193,7 @@ Code Seq# Include File Comments
1910xAD 00 Netfilter device in development: 1930xAD 00 Netfilter device in development:
192 <mailto:rusty@rustcorp.com.au> 194 <mailto:rusty@rustcorp.com.au>
1930xAE all linux/kvm.h Kernel-based Virtual Machine 1950xAE all linux/kvm.h Kernel-based Virtual Machine
194 <mailto:kvm-devel@lists.sourceforge.net> 196 <mailto:kvm@vger.kernel.org>
1950xB0 all RATIO devices in development: 1970xB0 all RATIO devices in development:
196 <mailto:vgo@ratio.de> 198 <mailto:vgo@ratio.de>
1970xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca> 1990xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca>