Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e67fa16e19381573215d44d87e9e19a71698d79e..d038b3c072a920956bbd406e0189c35dba0b5b46 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -107,7 +107,7 @@ source "drivers/block/mtip32xx/Kconfig"
 
 config BLK_CPQ_DA
        tristate "Compaq SMART2 support"
-       depends on PCI && VIRT_TO_BUS
+       depends on PCI && VIRT_TO_BUS && 0
        help
          This is the driver for Compaq Smart Array controllers.  Everyone
          using these boards should say Y here.  See the file
@@ -316,6 +316,16 @@ config BLK_DEV_NVME
          To compile this driver as a module, choose M here: the
          module will be called nvme.
 
+config BLK_DEV_SKD
+       tristate "STEC S1120 Block Driver"
+       depends on PCI
+       depends on 64BIT
+       ---help---
+       Saying Y or M here will enable support for the
+       STEC, Inc. S1120 PCIe SSD.
+
+       Use device /dev/skd$N amd /dev/skd$Np$M.
+
 config BLK_DEV_OSD
        tristate "OSD object-as-blkdev support"
        depends on SCSI_OSD_ULD