Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 8f3e2cb5c4c58f414317580a86ec5fd391113b51..87b4c5e82d39023094f9b5f9b10cf919e3740f9d 100644 (file)
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -353,6 +353,7 @@ Your cooperation is appreciated.
                133 = /dev/exttrp       External device trap
                134 = /dev/apm_bios     Advanced Power Management BIOS
                135 = /dev/rtc          Real Time Clock
+               137 = /dev/vhci         Bluetooth virtual HCI driver
                139 = /dev/openprom     SPARC OpenBoot PROM
                140 = /dev/relay8       Berkshire Products Octal relay card
                141 = /dev/relay16      Berkshire Products ISO-16 relay card
@@ -410,6 +411,7 @@ Your cooperation is appreciated.
                194 = /dev/zkshim       Zero-Knowledge network shim control
                195 = /dev/elographics/e2201    Elographics touchscreen E271-2201
                196 = /dev/vfio/vfio    VFIO userspace driver interface
+               197 = /dev/pxa3xx-gcu   PXA3xx graphics controller unit driver
                198 = /dev/sexec        Signed executable interface
                199 = /dev/scanners/cuecat :CueCat barcode scanner
                200 = /dev/net/tun      TAP/TUN network device
@@ -451,6 +453,7 @@ Your cooperation is appreciated.
                236 = /dev/mapper/control       Device-Mapper control device
                237 = /dev/loop-control Loopback control device
                238 = /dev/vhost-net    Host kernel accelerator for virtio net
+               239 = /dev/uhid         User-space I/O driver support for HID subsystem
 
                240-254                 Reserved for local use
                255                     Reserved for MISC_DYNAMIC_MINOR