diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 13:29:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 13:29:26 +1000 |
| commit | 145b391b59abf3a03186b91471d575f29d4b7de9 (patch) | |
| tree | 96f6bf17eb5b5ee75a9d7e08b2e674f0cd5bee99 /Documentation/admin-guide/devices.txt | |
| parent | 6512b25fafb0fed1a8c6ecb45797d1a026405b58 (diff) | |
| parent | 46505c802a55189955d97195c8567ee263168747 (diff) | |
Merge remote-tracking branch 'char-misc/char-misc-next'
Diffstat (limited to 'Documentation/admin-guide/devices.txt')
| -rw-r--r-- | Documentation/admin-guide/devices.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt index c9cea2e39c21..6b71852dadc2 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -369,8 +369,10 @@ 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 = /dev/userio Serio driver testing device + 241 = /dev/vhost-vsock Host kernel driver for virtio vsock - 240-254 Reserved for local use + 242-254 Reserved for local use 255 Reserved for MISC_DYNAMIC_MINOR 11 char Raw keyboard device (Linux/SPARC only) |