block: fix CDROM dependency on BLK_DEV

After the cdrom cleanup, I get randconfig warnings for some configurations:

warning: (BLK_DEV_IDECD && BLK_DEV_SR) selects CDROM which has unmet direct dependencies (BLK_DEV)

This adds an explicit BLK_DEV dependency for both drivers. The other
drivers that select 'CDROM' already have this and don't need a change.

Fixes: 2a750166a5be ("block: Rework drivers/cdrom/Makefile")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 7b92c591e4c11685b74e979fbd6a7d5aa74d4487..cf1fb3fb5d26fc7fef7804681fd41a72a11adbae 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -117,6 +117,7 @@ config BLK_DEV_DELKIN
 
 config BLK_DEV_IDECD
        tristate "Include IDE/ATAPI CDROM support"
+       depends on BLK_DEV
        select IDE_ATAPI
        select CDROM
        ---help---

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index cca0b03c2eadf4f3500bd9551befee7b2a6e3111..7669553180058f7c0d567c419bfd162df93f4593 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -130,7 +130,7 @@ 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