Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / Documentation / ioctl / ioctl-number.txt

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index dd5806f..63ffd78 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -74,11 +74,12 @@ Code  Seq#(hex)     Include File            Comments
 0x10   00-0F   drivers/char/s390/vmcp.h
 0x12   all     linux/fs.h
                linux/blkpg.h
-0x1b   all     InfiniBand Subsystem    <http://www.openib.org/>
+0x1b   all     InfiniBand Subsystem    <http://infiniband.sourceforge.net/>
 0x20   all     drivers/cdrom/cm206.h
 0x22   all     scsi/sg.h
 '#'    00-3F   IEEE 1394 Subsystem     Block for the entire subsystem
 '$'    00-0F   linux/perf_counter.h, linux/perf_event.h
+'&'    00-07   drivers/firewire/nosy-user.h
 '1'    00-1F   <linux/timepps.h>       PPS kit from Ulrich Windl
                                        <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/>
 '2'    01-04   linux/i2o.h
@@ -190,7 +191,7 @@ Code  Seq#(hex)     Include File            Comments
 '['    00-07   linux/usb/tmc.h         USB Test and Measurement Devices
                                        <mailto:gregkh@suse.de>
 'a'    all     linux/atm*.h, linux/sonet.h     ATM on linux
-                                       <http://lrcwww.epfl.ch/linux-atm/magic.html>
+                                       <http://lrcwww.epfl.ch/>
 'b'    00-FF                           conflict! bit3 vme host bridge
                                        <mailto:natalia@nikhefk.nikhef.nl>
 'b'    00-0F   media/bt819.h           conflict!
@@ -225,7 +226,7 @@ Code  Seq#(hex)     Include File            Comments
 'k'    00-0F   linux/spi/spidev.h      conflict!
 'k'    00-05   video/kyro.h            conflict!
 'l'    00-3F   linux/tcfs_fs.h         transparent cryptographic file system
-                                       <http://mikonos.dia.unisa.it/tcfs>
+                                       <http://web.archive.org/web/*/http://mikonos.dia.unisa.it/tcfs>
 'l'    40-7F   linux/udf_fs_i.h        in development:
                                        <http://sourceforge.net/projects/linux-udf/>
 'm'    00-09   linux/mmtimer.h         conflict!
@@ -252,13 +253,13 @@ Code  Seq#(hex)   Include File            Comments
                                        <mailto:giometti@linux.it>
 'q'    00-1F   linux/serio.h
 'q'    80-FF   linux/telephony.h       Internet PhoneJACK, Internet LineJACK
-               linux/ixjuser.h         <http://www.quicknet.net>
+               linux/ixjuser.h         <http://web.archive.org/web/*/http://www.quicknet.net>
 'r'    00-1F   linux/msdos_fs.h and fs/fat/dir.c
 's'    all     linux/cdk.h
 't'    00-7F   linux/if_ppp.h
 't'    80-8F   linux/isdn_ppp.h
 't'    90      linux/toshiba.h
-'u'    00-1F   linux/smb_fs.h
+'u'    00-1F   linux/smb_fs.h          gone
 'v'    all     linux/videodev.h        conflict!
 'v'    00-1F   linux/ext2_fs.h         conflict!
 'v'    00-1F   linux/fs.h              conflict!
@@ -277,7 +278,6 @@ Code  Seq#(hex)     Include File            Comments
                                        <mailto:oe@port.de>
 'z'    10-4F   drivers/s390/crypto/zcrypt_api.h        conflict!
 0x80   00-1F   linux/fb.h
-0x81   00-1F   linux/videotext.h
 0x88   00-3F   media/ovcamchip.h
 0x89   00-06   arch/x86/include/asm/sockios.h
 0x89   0B-DF   linux/sockios.h
@@ -286,7 +286,7 @@ Code  Seq#(hex)     Include File            Comments
 0x89   F0-FF   linux/sockios.h         SIOCDEVPRIVATE range
 0x8B   all     linux/wireless.h
 0x8C   00-3F                           WiNRADiO driver
-                                       <http://www.proximity.com.au/~brian/winradio/>
+                                       <http://www.winradio.com.au/>
 0x90   00      drivers/cdrom/sbpcd.h
 0x92   00-0F   drivers/usb/mon/mon_bin.c
 0x93   60-7F   linux/auto_fs.h