Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

[linux.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 104180e3c55e317e76480c8384ca4297acc6b8f3..4a438b8abe27ad9c1774c89f608bd47fecc295a3 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -112,33 +112,6 @@ source "drivers/block/mtip32xx/Kconfig"
 
 source "drivers/block/zram/Kconfig"
 
-config BLK_CPQ_CISS_DA
-       tristate "Compaq Smart Array 5xxx support"
-       depends on PCI
-       select CHECK_SIGNATURE
-       select BLK_SCSI_REQUEST
-       help
-         This is the driver for Compaq Smart Array 5xxx controllers.
-         Everyone using these boards should say Y here.
-         See <file:Documentation/blockdev/cciss.txt> for the current list of
-         boards supported by this driver, and for further information
-         on the use of this driver.
-
-config CISS_SCSI_TAPE
-       bool "SCSI tape drive support for Smart Array 5xxx"
-       depends on BLK_CPQ_CISS_DA && PROC_FS
-       depends on SCSI=y || SCSI=BLK_CPQ_CISS_DA
-       help
-         When enabled (Y), this option allows SCSI tape drives and SCSI medium
-         changers (tape robots) to be accessed via a Compaq 5xxx array 
-         controller.  (See <file:Documentation/blockdev/cciss.txt> for more details.)
-
-         "SCSI support" and "SCSI tape support" must also be enabled for this 
-         option to work.
-
-         When this option is disabled (N), the SCSI portion of the driver 
-         is not compiled.
-
 config BLK_DEV_DAC960
        tristate "Mylex DAC960/DAC1100 PCI RAID Controller support"
        depends on PCI