summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-30 23:45:41 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-30 23:45:41 -0400
commit1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch)
tree64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/cdrom/Kconfig
parentaebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff)
parent1bdfd554be94def718323659173517c5d4a69d25 (diff)
downloadkernel-crypto-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.gz
kernel-crypto-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.xz
kernel-crypto-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/cdrom/Kconfig')
-rw-r--r--drivers/cdrom/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/Kconfig b/drivers/cdrom/Kconfig
index ff5652d4061..4b12e9031fb 100644
--- a/drivers/cdrom/Kconfig
+++ b/drivers/cdrom/Kconfig
@@ -3,7 +3,7 @@
#
menu "Old CD-ROM drivers (not SCSI, not IDE)"
- depends on ISA
+ depends on ISA && BLOCK
config CD_NO_IDESCSI
bool "Support non-SCSI/IDE/ATAPI CDROM drives"