Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index dead61754ad76ef23ed532fbc503fe1d334491a9..dc6f2579f85cd81f31e4b1316d2b7d7ba69a127a 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -26,18 +26,31 @@ config MMC_PXA
 
 config MMC_SDHCI
        tristate "Secure Digital Host Controller Interface support"
 
 config MMC_SDHCI
        tristate "Secure Digital Host Controller Interface support"

-       depends on PCI
+       depends on HAS_DMA

        help
        help

-         This select the generic Secure Digital Host Controller Interface.
+         This selects the generic Secure Digital Host Controller Interface.

          It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
          and Toshiba(R). Most controllers found in laptops are of this type.
          It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
          and Toshiba(R). Most controllers found in laptops are of this type.

+
+         If you have a controller with this interface, say Y or M here. You
+         also need to enable an appropriate bus interface.
+
+         If unsure, say N.
+
+config MMC_SDHCI_PCI
+       tristate "SDHCI support on PCI bus"
+       depends on MMC_SDHCI && PCI
+       help
+         This selects the PCI Secure Digital Host Controller Interface.
+         Most controllers found today are PCI devices.
+

          If you have a controller with this interface, say Y or M here.
 
          If unsure, say N.
 
 config MMC_RICOH_MMC
        tristate "Ricoh MMC Controller Disabler  (EXPERIMENTAL)"
          If you have a controller with this interface, say Y or M here.
 
          If unsure, say N.
 
 config MMC_RICOH_MMC
        tristate "Ricoh MMC Controller Disabler  (EXPERIMENTAL)"

-       depends on PCI && EXPERIMENTAL && MMC_SDHCI
+       depends on MMC_SDHCI_PCI

        help
          This selects the disabler for the Ricoh MMC Controller. This
          proprietary controller is unnecessary because the SDHCI driver
        help
          This selects the disabler for the Ricoh MMC Controller. This
          proprietary controller is unnecessary because the SDHCI driver


@@ -91,6 +104,16 @@ config MMC_AT91
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config MMC_ATMELMCI
+       tristate "Atmel Multimedia Card Interface support"
+       depends on AVR32
+       help
+         This selects the Atmel Multimedia Card Interface driver. If
+         you have an AT32 (AVR32) platform with a Multimedia Card
+         slot, say Y or M here.
+
+         If unsure, say N.
+

 config MMC_IMX
        tristate "Motorola i.MX Multimedia Card Interface support"
        depends on ARCH_IMX
 config MMC_IMX
        tristate "Motorola i.MX Multimedia Card Interface support"
        depends on ARCH_IMX


@@ -130,3 +153,24 @@ config MMC_SPI
 
          If unsure, or if your system has no SPI master driver, say N.
 
 
          If unsure, or if your system has no SPI master driver, say N.
 

+config MMC_S3C
+       tristate "Samsung S3C SD/MMC Card Interface support"
+       depends on ARCH_S3C2410 && MMC
+       help
+         This selects a driver for the MCI interface found in
+          Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
+         If you have a board based on one of those and a MMC/SD
+         slot, say Y or M here.
+
+         If unsure, say N.
+
+config MMC_SDRICOH_CS
+       tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && MMC && PCI && PCMCIA
+       help
+         Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA
+         card whenever you insert a MMC or SD card into the card slot.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sdricoh_cs.
+