浏览代码

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>
Arnd Bergmann 7 年之前
父节点
当前提交
c091fbe9a2
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      drivers/ide/Kconfig
  2. 1 1
      drivers/scsi/Kconfig

+ 1 - 0
drivers/ide/Kconfig

@@ -117,6 +117,7 @@ config BLK_DEV_DELKIN
 
 
 config BLK_DEV_IDECD
 config BLK_DEV_IDECD
 	tristate "Include IDE/ATAPI CDROM support"
 	tristate "Include IDE/ATAPI CDROM support"
+	depends on BLK_DEV
 	select IDE_ATAPI
 	select IDE_ATAPI
 	select CDROM
 	select CDROM
 	---help---
 	---help---

+ 1 - 1
drivers/scsi/Kconfig

@@ -130,7 +130,7 @@ config CHR_DEV_OSST
 
 
 config BLK_DEV_SR
 config BLK_DEV_SR
 	tristate "SCSI CDROM support"
 	tristate "SCSI CDROM support"
-	depends on SCSI
+	depends on SCSI && BLK_DEV
 	select CDROM
 	select CDROM
 	---help---
 	---help---
 	  If you want to use a CD or DVD drive attached to your computer
 	  If you want to use a CD or DVD drive attached to your computer