Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6-omap-h63xx.git] / Documentation / devices.txt

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index bb67cf25010ed4ceb64b2157f3db4b299bf597c9..b369a8c46a7311c8d5561d730a95a6049cee2ff2 100644 (file)
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -94,6 +94,7 @@ Your cooperation is appreciated.
                  9 = /dev/urandom      Faster, less secure random number gen.
                 10 = /dev/aio          Asyncronous I/O notification interface
                 11 = /dev/kmsg         Writes to this come out as printk's
+                12 = /dev/oldmem       Access to crash dump from kexec kernel
   1 block      RAM disk
                  0 = /dev/ram0         First RAM disk
                  1 = /dev/ram1         Second RAM disk
@@ -1720,11 +1721,6 @@ Your cooperation is appreciated.
                These devices support the same API as the generic SCSI
                devices.
 
- 97 block      Packet writing for CD/DVD devices
-                 0 = /dev/pktcdvd0     First packet-writing module
-                 1 = /dev/pktcdvd1     Second packet-writing module
-                   ...
-
  98 char       Control and Measurement Device (comedi)
                  0 = /dev/comedi0      First comedi device
                  1 = /dev/comedi1      Second comedi device
@@ -2902,14 +2898,14 @@ Your cooperation is appreciated.
                196 = /dev/dvb/adapter3/video0    first video decoder of fourth card
 
 
-216 char       USB BlueTooth devices
-                 0 = /dev/ttyUB0               First USB BlueTooth device
-                 1 = /dev/ttyUB1               Second USB BlueTooth device
+216 char       Bluetooth RFCOMM TTY devices
+                 0 = /dev/rfcomm0              First Bluetooth RFCOMM TTY device
+                 1 = /dev/rfcomm1              Second Bluetooth RFCOMM TTY device
                    ...
 
-217 char       USB BlueTooth devices (alternate devices)
-                 0 = /dev/cuub0                Callout device for ttyUB0
-                 1 = /dev/cuub1                Callout device for ttyUB1
+217 char       Bluetooth RFCOMM TTY devices (alternate devices)
+                 0 = /dev/curf0                Callout device for rfcomm0
+                 1 = /dev/curf1                Callout device for rfcomm1
                    ...
 
 218 char       The Logical Company bus Unibus/Qbus adapters