Merge remote-tracking branch 'input/next'

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

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index b9015912bca6bb6ea7a73ef4dc2a94f189346385..80b72419ffd8a83dfc8e150d5f5088ec69e4f0d9 100644 (file)
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -100,8 +100,7 @@ Your cooperation is appreciated.
                 10 = /dev/aio          Asynchronous I/O notification interface
                 11 = /dev/kmsg         Writes to this come out as printk's, reads
                                        export the buffered printk records.
-                12 = /dev/oldmem       Used by crashdump kernels to access
-                                       the memory of the kernel that crashed.
+                12 = /dev/oldmem       OBSOLETE - replaced by /proc/vmcore
 
   1 block      RAM disk
                  0 = /dev/ram0         First RAM disk
@@ -415,6 +414,7 @@ Your cooperation is appreciated.
                200 = /dev/net/tun      TAP/TUN network device
                201 = /dev/button/gulpb Transmeta GULP-B buttons
                202 = /dev/emd/ctl      Enhanced Metadisk RAID (EMD) control
+               203 = /dev/cuse         Cuse (character device in user-space)
                204 = /dev/video/em8300         EM8300 DVD decoder control
                205 = /dev/video/em8300_mv      EM8300 DVD decoder video
                206 = /dev/video/em8300_ma      EM8300 DVD decoder audio