Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6.git] / Documentation / devices.txt
index 53d64d3..eccffe7 100644 (file)
@@ -239,6 +239,7 @@ Your cooperation is appreciated.
                  0 = /dev/tty          Current TTY device
                  1 = /dev/console      System console
                  2 = /dev/ptmx         PTY master multiplex
+                 3 = /dev/ttyprintk    User messages via printk TTY device
                 64 = /dev/cua0         Callout device for ttyS0
                    ...
                255 = /dev/cua191       Callout device for ttyS191
@@ -443,6 +444,9 @@ Your cooperation is appreciated.
                231 = /dev/snapshot     System memory snapshot device
                232 = /dev/kvm          Kernel-based virtual machine (hardware virtualization extensions)
                233 = /dev/kmview       View-OS A process with a view
+               234 = /dev/btrfs-control        Btrfs control device
+               235 = /dev/autofs       Autofs control device
+               236 = /dev/mapper/control       Device-Mapper control device
                240-254                 Reserved for local use
                255                     Reserved for MISC_DYNAMIC_MINOR
 
@@ -1492,9 +1496,6 @@ Your cooperation is appreciated.
                 64 = /dev/radio0       Radio device
                    ...
                127 = /dev/radio63      Radio device
-               192 = /dev/vtx0         Teletext device
-                   ...
-               223 = /dev/vtx31        Teletext device
                224 = /dev/vbi0         Vertical blank interrupt
                    ...
                255 = /dev/vbi31        Vertical blank interrupt
@@ -1515,7 +1516,7 @@ Your cooperation is appreciated.
                    ...
 
                The driver and documentation may be obtained from
-               http://www.proximity.com.au/~brian/winradio/
+               http://www.winradio.com/
 
  82 block      I2O hard disk
                  0 = /dev/i2o/hdag     33rd I2O hard disk, whole disk
@@ -1721,7 +1722,7 @@ Your cooperation is appreciated.
                  1 = /dev/comedi1      Second comedi device
                    ...
 
-               See http://stm.lbl.gov/comedi or http://www.llp.fu-berlin.de/.
+               See http://stm.lbl.gov/comedi.
 
  98 block      User-mode virtual block device
                  0 = /dev/ubda         First user-mode block device
@@ -1982,7 +1983,7 @@ Your cooperation is appreciated.
                 256 NetWare volumes can be supported in a single
                 machine.
 
-                http://www.kernel.org/pub/linux/kernel/people/jmerkey/nwfs
+                http://cgfa.telepac.pt/ftp2/kernel.org/linux/kernel/people/jmerkey/nwfs/
 
                 0 = /dev/nwfs/v0    First NetWare (NWFS) Logical Volume
                 1 = /dev/nwfs/v1    Second NetWare (NWFS) Logical Volume
@@ -2516,6 +2517,12 @@ Your cooperation is appreciated.
                  8 = /dev/mmcblk1      Second SD/MMC card
                    ...
 
+               The start of next SD/MMC card can be configured with
+               CONFIG_MMC_BLOCK_MINORS, or overridden at boot/modprobe
+               time using the mmcblk.perdev_minors option. That would
+               bump the offset between each card to be the configured
+               value instead of the default 8.
+
 179 char       CCube DVXChip-based PCI products
                  0 = /dev/dvxirq0      First DVX device
                  1 = /dev/dvxirq1      Second DVX device
@@ -2550,7 +2557,10 @@ Your cooperation is appreciated.
                175 = /dev/usb/legousbtower15   16th USB Legotower device
                176 = /dev/usb/usbtmc1  First USB TMC device
                   ...
-               192 = /dev/usb/usbtmc16 16th USB TMC device
+               191 = /dev/usb/usbtmc16 16th USB TMC device
+               192 = /dev/usb/yurex1   First USB Yurex device
+                  ...
+               209 = /dev/usb/yurex16  16th USB Yurex device
                240 = /dev/usb/dabusb0  First daubusb device
                    ...
                243 = /dev/usb/dabusb3  Fourth dabusb device
@@ -2589,7 +2599,8 @@ Your cooperation is appreciated.
                  1 = /dev/intermezzo1  Second cache manager
                    ...
 
-               See http://www.inter-mezzo.org/ for more information.
+               See http://web.archive.org/web/20080115195241/
+               http://inter-mezzo.org/index.html
 
 186 char       Object-based storage control device
                  0 = /dev/obd0         First obd control device