Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index d06b2dfe3c9574a51e64b428955fba86d21bd7a0..3a5089f0332c5f06f702a44f1d9b44eeddad1c86 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -501,6 +501,7 @@ config MMC_SDHCI_MSM
        depends on ARCH_QCOM || (ARM && COMPILE_TEST)
        depends on MMC_SDHCI_PLTFM
        select MMC_SDHCI_IO_ACCESSORS
+       select MMC_CQHCI
        help
          This selects the Secure Digital Host Controller Interface (SDHCI)
          support present in Qualcomm SOCs. The controller supports
@@ -990,6 +991,7 @@ config MMC_SDHCI_BRCMSTB
        tristate "Broadcom SDIO/SD/MMC support"
        depends on ARCH_BRCMSTB || BMIPS_GENERIC
        depends on MMC_SDHCI_PLTFM
+       select MMC_CQHCI
        default y
        help
          This selects support for the SDIO/SD/MMC Host Controller on
@@ -1010,6 +1012,7 @@ config MMC_SDHCI_OMAP
        depends on MMC_SDHCI_PLTFM && OF
        select THERMAL
        imply TI_SOC_THERMAL
+       select MMC_SDHCI_EXTERNAL_DMA if DMA_ENGINE
        help
          This selects the Secure Digital Host Controller Interface (SDHCI)
          support present in TI's DRA7 SOCs. The controller supports
@@ -1040,3 +1043,6 @@ config MMC_OWL
        help
          This selects support for the SD/MMC Host Controller on
          Actions Semi Owl SoCs.
+
+config MMC_SDHCI_EXTERNAL_DMA
+       bool