diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /Documentation/ioctl/ioctl-number.txt | |
parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) |
Merge branch 'linus' into release
Diffstat (limited to 'Documentation/ioctl/ioctl-number.txt')
-rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index b880ce5dbd33..f1d639903325 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
@@ -84,7 +84,7 @@ Code Seq# Include File Comments | |||
84 | 'B' C0-FF advanced bbus | 84 | 'B' C0-FF advanced bbus |
85 | <mailto:maassen@uni-freiburg.de> | 85 | <mailto:maassen@uni-freiburg.de> |
86 | 'C' all linux/soundcard.h | 86 | 'C' all linux/soundcard.h |
87 | 'D' all asm-s390/dasd.h | 87 | 'D' all arch/s390/include/asm/dasd.h |
88 | 'E' all linux/input.h | 88 | 'E' all linux/input.h |
89 | 'F' all linux/fb.h | 89 | 'F' all linux/fb.h |
90 | 'H' all linux/hiddev.h | 90 | 'H' all linux/hiddev.h |
@@ -97,6 +97,7 @@ Code Seq# Include File Comments | |||
97 | <http://linux01.gwdg.de/~alatham/ppdd.html> | 97 | <http://linux01.gwdg.de/~alatham/ppdd.html> |
98 | 'M' all linux/soundcard.h | 98 | 'M' all linux/soundcard.h |
99 | 'N' 00-1F drivers/usb/scanner.h | 99 | 'N' 00-1F drivers/usb/scanner.h |
100 | 'O' 00-02 include/mtd/ubi-user.h UBI | ||
100 | 'P' all linux/soundcard.h | 101 | 'P' all linux/soundcard.h |
101 | 'Q' all linux/soundcard.h | 102 | 'Q' all linux/soundcard.h |
102 | 'R' 00-1F linux/random.h | 103 | 'R' 00-1F linux/random.h |
@@ -104,7 +105,7 @@ Code Seq# Include File Comments | |||
104 | 'S' 80-81 scsi/scsi_ioctl.h conflict! | 105 | 'S' 80-81 scsi/scsi_ioctl.h conflict! |
105 | 'S' 82-FF scsi/scsi.h conflict! | 106 | 'S' 82-FF scsi/scsi.h conflict! |
106 | 'T' all linux/soundcard.h conflict! | 107 | 'T' all linux/soundcard.h conflict! |
107 | 'T' all asm-i386/ioctls.h conflict! | 108 | 'T' all arch/x86/include/asm/ioctls.h conflict! |
108 | 'U' 00-EF linux/drivers/usb/usb.h | 109 | 'U' 00-EF linux/drivers/usb/usb.h |
109 | 'V' all linux/vt.h | 110 | 'V' all linux/vt.h |
110 | 'W' 00-1F linux/watchdog.h conflict! | 111 | 'W' 00-1F linux/watchdog.h conflict! |
@@ -119,7 +120,7 @@ Code Seq# Include File Comments | |||
119 | <mailto:natalia@nikhefk.nikhef.nl> | 120 | <mailto:natalia@nikhefk.nikhef.nl> |
120 | 'c' 00-7F linux/comstats.h conflict! | 121 | 'c' 00-7F linux/comstats.h conflict! |
121 | 'c' 00-7F linux/coda.h conflict! | 122 | 'c' 00-7F linux/coda.h conflict! |
122 | 'c' 80-9F asm-s390/chsc.h | 123 | 'c' 80-9F arch/s390/include/asm/chsc.h |
123 | 'd' 00-FF linux/char/drm/drm/h conflict! | 124 | 'd' 00-FF linux/char/drm/drm/h conflict! |
124 | 'd' 00-DF linux/video_decoder.h conflict! | 125 | 'd' 00-DF linux/video_decoder.h conflict! |
125 | 'd' F0-FF linux/digi1.h | 126 | 'd' F0-FF linux/digi1.h |
@@ -142,6 +143,9 @@ Code Seq# Include File Comments | |||
142 | 'n' 00-7F linux/ncp_fs.h | 143 | 'n' 00-7F linux/ncp_fs.h |
143 | 'n' E0-FF video/matrox.h matroxfb | 144 | 'n' E0-FF video/matrox.h matroxfb |
144 | 'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 | 145 | 'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 |
146 | 'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) | ||
147 | 'o' 40-41 include/mtd/ubi-user.h UBI | ||
148 | 'o' 01-A1 include/linux/dvb/*.h DVB | ||
145 | 'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) | 149 | 'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) |
146 | 'p' 00-3F linux/mc146818rtc.h conflict! | 150 | 'p' 00-3F linux/mc146818rtc.h conflict! |
147 | 'p' 40-7F linux/nvram.h | 151 | 'p' 40-7F linux/nvram.h |
@@ -166,7 +170,7 @@ Code Seq# Include File Comments | |||
166 | <mailto:oe@port.de> | 170 | <mailto:oe@port.de> |
167 | 0x80 00-1F linux/fb.h | 171 | 0x80 00-1F linux/fb.h |
168 | 0x81 00-1F linux/videotext.h | 172 | 0x81 00-1F linux/videotext.h |
169 | 0x89 00-06 asm-i386/sockios.h | 173 | 0x89 00-06 arch/x86/include/asm/sockios.h |
170 | 0x89 0B-DF linux/sockios.h | 174 | 0x89 0B-DF linux/sockios.h |
171 | 0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range | 175 | 0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range |
172 | 0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range | 176 | 0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range |