summaryrefslogtreecommitdiff
path: root/Documentation/devices.txt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 19:02:38 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 19:02:38 (GMT)
commit1508124d8a4e0995362d93d82e5555a74bfc998f (patch)
tree62b36e0fa03b40e68be6941c5139e8ff7653d0b2 /Documentation/devices.txt
parent976f8bef9cfb5246bc0e8dc781562daa79cb7aaf (diff)
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
downloadlinux-fsl-qoriq-1508124d8a4e0995362d93d82e5555a74bfc998f.tar.xz
Merge 3.10-rc6 into usb-next
We want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devices.txt')
-rw-r--r--Documentation/devices.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 08f01e7..b901591 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -498,12 +498,8 @@ Your cooperation is appreciated.
Each device type has 5 bits (32 minors).
- 13 block 8-bit MFM/RLL/IDE controller
- 0 = /dev/xda First XT disk whole disk
- 64 = /dev/xdb Second XT disk whole disk
-
- Partitions are handled in the same way as IDE disks
- (see major number 3).
+ 13 block Previously used for the XT disk (/dev/xdN)
+ Deleted in kernel v3.9.
14 char Open Sound System (OSS)
0 = /dev/mixer Mixer control