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 555aed0b50dd1c67ec3ded76f15773bf24354c0e..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
@@ -515,7 +515,7 @@ config VIRTIO_BLK
 config BLK_DEV_HD
        bool "Very old hard disk (MFM/RLL/IDE) driver"
        depends on HAVE_IDE
-       depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
+       depends on !ARM || ARCH_RPC || BROKEN
        help
          This is a very old hard disk driver that lacks the enhanced
          functionality of the newer ones.