aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-24 17:42:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-24 17:42:31 -0800
commit2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d (patch)
treed9bbec83fa54dd5338144089b6dcb570a40237e7 /Documentation
parent5c85121bf618aece49155f6eea0d0b2c14c1a121 (diff)
parent3be3a074cf5ba641529d8fdae0e05ca642f23e12 (diff)
Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio
Pull vfio update from Alex Williamson: - convert to misc driver to support module auto loading - remove unnecessary and dangerous use of device_lock * tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio: vfio-pci: Don't use device_lock around AER interrupt setup vfio: Convert control interface to misc driver misc: Reserve minor for VFIO
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devices.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 80b72419ffd8..10378cc48374 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -409,6 +409,7 @@ Your cooperation is appreciated.
193 = /dev/d7s SPARC 7-segment display
194 = /dev/zkshim Zero-Knowledge network shim control
195 = /dev/elographics/e2201 Elographics touchscreen E271-2201
+ 196 = /dev/vfio/vfio VFIO userspace driver interface
198 = /dev/sexec Signed executable interface
199 = /dev/scanners/cuecat :CueCat barcode scanner
200 = /dev/net/tun TAP/TUN network device

Privacy Policy