Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / Documentation / ioctl-number.txt

diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 1af5712..171a44e 100644 (file)
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -72,13 +72,12 @@ Code        Seq#    Include File            Comments
 0x09   all     linux/md.h
 0x12   all     linux/fs.h
                linux/blkpg.h
+0x1b   all     InfiniBand Subsystem    <http://www.openib.org/>
 0x20   all     drivers/cdrom/cm206.h
 0x22   all     scsi/sg.h
 '#'    00-3F   IEEE 1394 Subsystem     Block for the entire subsystem
 '1'    00-1F   <linux/timepps.h>       PPS kit from Ulrich Windl
                                        <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/>
-'6'    00-10   <asm-i386/processor.h>  Intel IA32 microcode update driver
-                                       <mailto:tigran@veritas.com>
 '8'    all                             SNP8023 advanced NIC card
                                        <mailto:mcr@solidum.com>
 'A'    00-1F   linux/apm_bios.h
@@ -117,6 +116,7 @@ Code        Seq#    Include File            Comments
                                        <mailto:natalia@nikhefk.nikhef.nl>
 'c'    00-7F   linux/comstats.h        conflict!
 'c'    00-7F   linux/coda.h            conflict!
+'d'    00-FF   linux/char/drm/drm/h    conflict!
 'd'    00-1F   linux/devfs_fs.h        conflict!
 'd'    00-DF   linux/video_decoder.h   conflict!
 'd'    F0-FF   linux/digi1.h
@@ -128,12 +128,10 @@ Code      Seq#    Include File            Comments
                                        <mailto:zapman@interlan.net>
 'i'    00-3F   linux/i2o.h
 'j'    00-3F   linux/joystick.h
-'k'    all     asm-sparc/kbio.h
-               asm-sparc64/kbio.h
 'l'    00-3F   linux/tcfs_fs.h         transparent cryptographic file system
                                        <http://mikonos.dia.unisa.it/tcfs>
 'l'    40-7F   linux/udf_fs_i.h        in development:
-                                       <http://www.trylinux.com/projects/udf/>
+                                       <http://sourceforge.net/projects/linux-udf/>
 'm'    all     linux/mtio.h            conflict!
 'm'    all     linux/soundcard.h       conflict!
 'm'    all     linux/synclink.h        conflict!
@@ -144,7 +142,7 @@ Code        Seq#    Include File            Comments
 'p'    40-7F   linux/nvram.h
 'p'    80-9F                           user-space parport
                                        <mailto:tim@cyberelk.net>
-'q'    00-1F   linux/videotext.h       conflict!
+'q'    00-1F   linux/serio.h
 'q'    80-FF                           Internet PhoneJACK, Internet LineJACK
                                        <http://www.quicknet.net>
 'r'    00-1F   linux/msdos_fs.h
@@ -162,6 +160,7 @@ Code        Seq#    Include File            Comments
 'z'    40-7F                           CAN bus card
                                        <mailto:oe@port.de>
 0x80   00-1F   linux/fb.h
+0x81   00-1F   linux/videotext.h
 0x89   00-06   asm-i386/sockios.h
 0x89   0B-DF   linux/sockios.h
 0x89   E0-EF   linux/sockios.h         SIOCPROTOPRIVATE range
@@ -189,3 +188,5 @@ Code        Seq#    Include File            Comments
                                        <mailto:michael.klein@puffin.lb.shuttle.de>
 0xDD   00-3F   ZFCP device driver      see drivers/s390/scsi/
                                        <mailto:aherrman@de.ibm.com>
+0xF3   00-3F   video/sisfb.h           sisfb (in development)
+                                       <mailto:thomas@winischhofer.net>