From 2a750166a5bee7fda186c12269e37ba52b26c017 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 30 Oct 2017 09:02:19 -0700 Subject: block: Rework drivers/cdrom/Makefile Instead of referring from inside drivers/cdrom/Makefile to all the drivers that use this driver, let these drivers select the cdrom driver. This change makes the cdrom build code follow the approach that is used for most other drivers, namely refer from the higher layers to the lower layer instead of from the lower layer to the higher layers. Reviewed-by: Hannes Reinecke Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Johannes Thumshirn Signed-off-by: Jens Axboe --- drivers/block/Kconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'drivers/block/Kconfig') diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 4a438b8abe27..b998b3c9ea86 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -67,9 +67,20 @@ config AMIGA_Z2RAM To compile this driver as a module, choose M here: the module will be called z2ram. +config CDROM + tristate "CD-ROM driver" + help + A CD-ROM is a pre-pressed optical compact disc which contains + data. The name is an acronym which stands for "Compact Disc + Read-Only Memory". This driver implements functionality that is + shared by all CD-ROM drivers, e.g. the IDE CD-ROM driver and the + SCSI CD-ROM driver. For a list of the ioctls implemented by this + driver, see also Documentation/ioctl/cdrom.txt. + config GDROM tristate "SEGA Dreamcast GD-ROM drive" depends on SH_DREAMCAST + select CDROM select BLK_SCSI_REQUEST # only for the generic cdrom code help A standard SEGA Dreamcast comes with a modified CD ROM drive called a @@ -347,6 +358,7 @@ config BLK_DEV_RAM_DAX config CDROM_PKTCDVD tristate "Packet writing on CD/DVD media (DEPRECATED)" depends on !UML + select CDROM select BLK_SCSI_REQUEST help Note: This driver is deprecated and will be removed from the -- cgit v1.2.3 From a116895fc7b61de4f26548c9b635a06515ec7563 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 3 Nov 2017 11:00:03 -0600 Subject: cdrom: hide CONFIG_CDROM menu selection We don't need to expose this. The point is that drivers select the uniform CDROM layer, if they need it, the user should not have to make a conscious decision on whether to include this separately or not. Fixes: 2a750166a5be ("block: Rework drivers/cdrom/Makefile") Signed-off-by: Jens Axboe --- drivers/block/Kconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'drivers/block/Kconfig') diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index b998b3c9ea86..95e678716b5e 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -68,14 +68,7 @@ config AMIGA_Z2RAM module will be called z2ram. config CDROM - tristate "CD-ROM driver" - help - A CD-ROM is a pre-pressed optical compact disc which contains - data. The name is an acronym which stands for "Compact Disc - Read-Only Memory". This driver implements functionality that is - shared by all CD-ROM drivers, e.g. the IDE CD-ROM driver and the - SCSI CD-ROM driver. For a list of the ioctls implemented by this - driver, see also Documentation/ioctl/cdrom.txt. + tristate config GDROM tristate "SEGA Dreamcast GD-ROM drive" -- cgit v1.2.3