Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[karo-tx-linux.git] / Documentation / devices.txt

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index b2f593fc76ca736a10941a5983dbbab3c8973afe..70690f1a14af53cd128ab0a553421044e28cd319 100644 (file)
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -3,7 +3,7 @@
 
             Maintained by Torben Mathiasen <device@lanana.org>
 
 
             Maintained by Torben Mathiasen <device@lanana.org>
 

-                     Last revised: 01 March 2006
+                     Last revised: 15 May 2006

 
 This list is the Linux Device List, the official registry of allocated
 device numbers and /dev directory nodes for the Linux operating
 
 This list is the Linux Device List, the official registry of allocated
 device numbers and /dev directory nodes for the Linux operating


@@ -92,7 +92,7 @@ Your cooperation is appreciated.
                  7 = /dev/full         Returns ENOSPC on write
                  8 = /dev/random       Nondeterministic random number gen.
                  9 = /dev/urandom      Faster, less secure random number gen.
                  7 = /dev/full         Returns ENOSPC on write
                  8 = /dev/random       Nondeterministic random number gen.
                  9 = /dev/urandom      Faster, less secure random number gen.

-                10 = /dev/aio          Asyncronous I/O notification interface
+                10 = /dev/aio          Asynchronous I/O notification interface

                 11 = /dev/kmsg         Writes to this come out as printk's
   1 block      RAM disk
                  0 = /dev/ram0         First RAM disk
                 11 = /dev/kmsg         Writes to this come out as printk's
   1 block      RAM disk
                  0 = /dev/ram0         First RAM disk


@@ -1093,7 +1093,7 @@ Your cooperation is appreciated.
 
  55 char       DSP56001 digital signal processor
                  0 = /dev/dsp56k       First DSP56001
 
  55 char       DSP56001 digital signal processor
                  0 = /dev/dsp56k       First DSP56001

- 55 block      Mylex DAC960 PCI RAID controller; eigth controller
+ 55 block      Mylex DAC960 PCI RAID controller; eighth controller

                  0 = /dev/rd/c7d0      First disk, whole disk
                  8 = /dev/rd/c7d1      Second disk, whole disk
                    ...
                  0 = /dev/rd/c7d0      First disk, whole disk
                  8 = /dev/rd/c7d1      Second disk, whole disk
                    ...


@@ -1456,7 +1456,7 @@ Your cooperation is appreciated.
                  1 = /dev/cum1         Callout device for ttyM1
                    ...
 
                  1 = /dev/cum1         Callout device for ttyM1
                    ...
 

- 79 block      Compaq Intelligent Drive Array, eigth controller
+ 79 block      Compaq Intelligent Drive Array, eighth controller

                  0 = /dev/ida/c7d0     First logical drive whole disk
                 16 = /dev/ida/c7d1     Second logical drive whole disk
                    ...
                  0 = /dev/ida/c7d0     First logical drive whole disk
                 16 = /dev/ida/c7d1     Second logical drive whole disk
                    ...


@@ -1900,7 +1900,7 @@ Your cooperation is appreciated.
                  1 = /dev/av1          Second A/V card
                    ...
 
                  1 = /dev/av1          Second A/V card
                    ...
 

-111 block      Compaq Next Generation Drive Array, eigth controller
+111 block      Compaq Next Generation Drive Array, eighth controller

                  0 = /dev/cciss/c7d0   First logical drive, whole disk
                 16 = /dev/cciss/c7d1   Second logical drive, whole disk
                    ...
                  0 = /dev/cciss/c7d0   First logical drive, whole disk
                 16 = /dev/cciss/c7d1   Second logical drive, whole disk
                    ...


@@ -2005,7 +2005,7 @@ Your cooperation is appreciated.
 116 char       Advanced Linux Sound Driver (ALSA)
 
 116 block       MicroMemory battery backed RAM adapter (NVRAM)
 116 char       Advanced Linux Sound Driver (ALSA)
 
 116 block       MicroMemory battery backed RAM adapter (NVRAM)

-                Supports 16 boards, 15 paritions each.
+                Supports 16 boards, 15 partitions each.

                 Requested by neilb at cse.unsw.edu.au.
 
                 0 = /dev/umem/d0      Whole of first board
                 Requested by neilb at cse.unsw.edu.au.
 
                 0 = /dev/umem/d0      Whole of first board


@@ -2543,6 +2543,9 @@ Your cooperation is appreciated.
                 64 = /dev/usb/rio500   Diamond Rio 500
                 65 = /dev/usb/usblcd   USBLCD Interface (info@usblcd.de)
                 66 = /dev/usb/cpad0    Synaptics cPad (mouse/LCD)
                 64 = /dev/usb/rio500   Diamond Rio 500
                 65 = /dev/usb/usblcd   USBLCD Interface (info@usblcd.de)
                 66 = /dev/usb/cpad0    Synaptics cPad (mouse/LCD)

+                67 = /dev/usb/adutux0  1st Ontrak ADU device
+                   ...
+                76 = /dev/usb/adutux10 10th Ontrak ADU device

                 96 = /dev/usb/hiddev0  1st USB HID device
                    ...
                111 = /dev/usb/hiddev15 16th USB HID device
                 96 = /dev/usb/hiddev0  1st USB HID device
                    ...
                111 = /dev/usb/hiddev15 16th USB HID device


@@ -2565,10 +2568,10 @@ Your cooperation is appreciated.
                243 = /dev/usb/dabusb3  Fourth dabusb device
 
 180 block      USB block devices
                243 = /dev/usb/dabusb3  Fourth dabusb device
 
 180 block      USB block devices

-               0 = /dev/uba            First USB block device
-               8 = /dev/ubb            Second USB block device
-               16 = /dev/ubc           Thrid USB block device
-               ...
+                 0 = /dev/uba          First USB block device
+                 8 = /dev/ubb          Second USB block device
+                16 = /dev/ubc          Third USB block device
+                   ...

 
 181 char       Conrad Electronic parallel port radio clocks
                  0 = /dev/pcfclock0    First Conrad radio clock
 
 181 char       Conrad Electronic parallel port radio clocks
                  0 = /dev/pcfclock0    First Conrad radio clock


@@ -2791,6 +2794,7 @@ Your cooperation is appreciated.
                 170 = /dev/ttyNX0              Hilscher netX serial port 0
                    ...
                 185 = /dev/ttyNX15             Hilscher netX serial port 15
                 170 = /dev/ttyNX0              Hilscher netX serial port 0
                    ...
                 185 = /dev/ttyNX15             Hilscher netX serial port 15

+                186 = /dev/ttyJ0               JTAG1 DCC protocol based serial port emulation

 
 205 char       Low-density serial ports (alternate device)
                  0 = /dev/culu0                Callout device for ttyLU0
 
 205 char       Low-density serial ports (alternate device)
                  0 = /dev/culu0                Callout device for ttyLU0


@@ -3090,7 +3094,7 @@ Your cooperation is appreciated.
                This major is reserved to assist the expansion to a
                larger number space.  No device nodes with this major
                should ever be created on the filesystem.
                This major is reserved to assist the expansion to a
                larger number space.  No device nodes with this major
                should ever be created on the filesystem.

-               (This is probaly not true anymore, but I'll leave it
+               (This is probably not true anymore, but I'll leave it

                for now /Torben)
 
 ---LARGE MAJORS!!!!!---
                for now /Torben)
 
 ---LARGE MAJORS!!!!!---


@@ -3108,6 +3112,10 @@ Your cooperation is appreciated.
                  ...
                240 = /dev/rfdp         16th RFD FTL layer
 
                  ...
                240 = /dev/rfdp         16th RFD FTL layer
 

+257 char       Phoenix Technologies Cryptographic Services Driver
+                 0 = /dev/ptlsec       Crypto Services Driver
+
+

 
  ****  ADDITIONAL /dev DIRECTORY ENTRIES
 
 
  ****  ADDITIONAL /dev DIRECTORY ENTRIES
 


@@ -3197,7 +3205,7 @@ for a session; this includes virtual consoles, serial ports, and
 pseudoterminals (PTYs).
 
 All terminal devices share a common set of capabilities known as line
 pseudoterminals (PTYs).
 
 All terminal devices share a common set of capabilities known as line

-diciplines; these include the common terminal line dicipline as well
+disciplines; these include the common terminal line discipline as well

 as SLIP and PPP modes.
 
 All terminal devices are named similarly; this section explains the
 as SLIP and PPP modes.
 
 All terminal devices are named similarly; this section explains the


@@ -3277,7 +3285,7 @@ port TTY, for which no alternate device would exist.
        Pseudoterminals (PTYs)
 
 Pseudoterminals, or PTYs, are used to create login sessions or provide
        Pseudoterminals (PTYs)
 
 Pseudoterminals, or PTYs, are used to create login sessions or provide

-other capabilities requiring a TTY line dicipline (including SLIP or
+other capabilities requiring a TTY line discipline (including SLIP or

 PPP capability) to arbitrary data-generation processes.         Each PTY has
 a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named
 /dev/tty[p-za-e][0-9a-f].  The kernel arbitrates the use of PTYs by
 PPP capability) to arbitrary data-generation processes.         Each PTY has
 a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named
 /dev/tty[p-za-e][0-9a-f].  The kernel arbitrates the use of PTYs by