aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/cdrom
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2017-10-12 15:00:06 +1100
committerJonathan Corbet <corbet@lwn.net>2017-10-12 11:25:31 -0600
commit1ad6e3b2652b310e4ab1a544894c79d4f7cb39d3 (patch)
tree81aecd992c2e25fedd97ce7f3a144ce0e0036721 /Documentation/cdrom
parentMerge branch 'refs' into docs-next (diff)
downloadlinux-dev-1ad6e3b2652b310e4ab1a544894c79d4f7cb39d3.tar.xz
linux-dev-1ad6e3b2652b310e4ab1a544894c79d4f7cb39d3.zip
documentation: Update ide-cd documentation to reflect CONFIG_BLK_DEV_HD_IDE removal
CONFIG_BLK_DEV_HD_IDE was removed in commit 80aa31cb460d ("ide: remove CONFIG_BLK_DEV_HD_IDE config option (take 2)") but the ide-cd documentation was not updated and still asks users to disable it, which is misleading and involves a fruitless search. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/cdrom')
-rw-r--r--Documentation/cdrom/ide-cd6
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/cdrom/ide-cd b/Documentation/cdrom/ide-cd
index f4dc9de2694e..a5f2a7f1ff46 100644
--- a/Documentation/cdrom/ide-cd
+++ b/Documentation/cdrom/ide-cd
@@ -55,13 +55,9 @@ This driver provides the following features:
(to compile support as a module which can be loaded and unloaded)
to the options:
- Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support
+ ATA/ATAPI/MFM/RLL support
Include IDE/ATAPI CDROM support
- and `no' to
-
- Use old disk-only driver on primary interface
-
Depending on what type of IDE interface you have, you may need to
specify additional configuration options. See
Documentation/ide/ide.txt.