Merge branch 'pci/yinghai-hotplug-cleanup' into next

[~andy/linux] / Documentation / devices.txt

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 5941f5136c6b6adadf1f28554278896280782ccd..47a154f302900a9b7448723e171e7fbdc2793054 100644 (file)
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -847,13 +847,7 @@ Your cooperation is appreciated.
                    ...
                 31 = /dev/tap15        16th Ethertap device
 
- 36 block      MCA ESDI hard disk
-                 0 = /dev/eda          First ESDI disk whole disk
-                64 = /dev/edb          Second ESDI disk whole disk
-                   ...
-
-               Partitions are handled in the same way as IDE disks
-               (see major number 3).
+ 36 block      OBSOLETE (was MCA ESDI hard disk)
 
  37 char       IDE tape
                  0 = /dev/ht0          First IDE tape