summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorBart Van Assche <bart.vanassche@wdc.com>2017-10-30 09:02:19 -0700
committerJens Axboe <axboe@kernel.dk>2017-11-01 08:33:57 -0600
commit2a750166a5bee7fda186c12269e37ba52b26c017 (patch)
tree8582c8546c8d52f94685195c9b549cb7d5cb5a6f /drivers/block
parent1f460b63d4b37f504d8d0affc2cd492eb005ea97 (diff)
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 <hare@suse.com> Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/Kconfig12
-rw-r--r--drivers/block/paride/Kconfig1
2 files changed, 13 insertions, 0 deletions
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
diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig
index 3a15247942e4..1d5057f5080b 100644
--- a/drivers/block/paride/Kconfig
+++ b/drivers/block/paride/Kconfig
@@ -25,6 +25,7 @@ config PARIDE_PD
config PARIDE_PCD
tristate "Parallel port ATAPI CD-ROMs"
depends on PARIDE
+ select CDROM
select BLK_SCSI_REQUEST # only for the generic cdrom code
---help---
This option enables the high-level driver for ATAPI CD-ROM devices