summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-01-10 13:17:17 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2014-01-10 13:17:17 +1100
commitf7f483b7c64695af05e1ce58cc23001631281fe4 (patch)
tree843a60d4e058568d7a4ce8ff4468cab1977b0a07 /Documentation
parent7c276952af7be2c6f050cb4884873cac291ee338 (diff)
parentd10999016f4164e9b80f1b3dece3842087cfa3bb (diff)
Merge remote-tracking branch 'vfio/next'
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