Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos...

[platform/kernel/linux-rpi.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 2b1cd30..8a739b7 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -130,7 +130,8 @@ config CHR_DEV_OSST
 
 config BLK_DEV_SR
        tristate "SCSI CDROM support"
-       depends on SCSI
+       depends on SCSI && BLK_DEV
+       select CDROM
        ---help---
          If you want to use a CD or DVD drive attached to your computer
          by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO