Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

[net-next-2.6.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index e171e77f6129d8b80829099fabe0bdd1a8e25f71..283190bc2a40c11b7cea3defafc31cc314a4d683 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -121,6 +121,15 @@ config MMC_SDHCI_PLTFM
 
          If unsure, say N.
 
+config MMC_SDHCI_CNS3XXX
+       bool "SDHCI support on the Cavium Networks CNS3xxx SoC"
+       depends on ARCH_CNS3XXX
+       depends on MMC_SDHCI_PLTFM
+       help
+         This selects the SDHCI support for CNS3xxx System-on-Chip devices.
+
+         If unsure, say N.
+
 config MMC_SDHCI_S3C
        tristate "SDHCI support on Samsung S3C SoC"
        depends on MMC_SDHCI && (PLAT_S3C24XX || PLAT_S3C64XX)
@@ -247,12 +256,13 @@ config MMC_IMX
 
          If unsure, say N.
 
-config MMC_MSM7X00A
-       tristate "Qualcomm MSM 7X00A SDCC Controller Support"
+config MMC_MSM
+       tristate "Qualcomm SDCC Controller Support"
        depends on MMC && ARCH_MSM
        help
          This provides support for the SD/MMC cell found in the
-          MSM 7X00A controllers from Qualcomm.
+         MSM and QSD SOCs from Qualcomm. The controller also has
+         support for SDIO devices.
 
 config MMC_MXC
        tristate "Freescale i.MX2/3 Multimedia Card Interface support"
@@ -432,3 +442,12 @@ config MMC_SH_MMCIF
          This selects the MMC Host Interface controler (MMCIF).
 
          This driver supports MMCIF in sh7724/sh7757/sh7372.
+
+config MMC_JZ4740
+       tristate "JZ4740 SD/Multimedia Card Interface support"
+       depends on MACH_JZ4740
+       help
+         This selects support for the SD/MMC controller on Ingenic JZ4740
+         SoCs.
+         If you have a board based on such a SoC and with a SD/MMC slot,
+         say Y or M here.