Merge remote-tracking branch 'drop-experimental/linux-next'

[karo-tx-linux.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 54b2e7f0011427a8a9cf85a970af4a4e8ba80432..6ae6b58e373603e272a16c12b31fe29b6a2dc07f 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -69,7 +69,7 @@ config MMC_SDHCI_PCI
          If unsure, say N.
 
 config MMC_RICOH_MMC
-       bool "Ricoh MMC Controller Disabler  (EXPERIMENTAL)"
+       bool "Ricoh MMC Controller Disabler"
        depends on MMC_SDHCI_PCI
        help
          This adds a pci quirk to disable Ricoh MMC Controller. This
@@ -174,9 +174,6 @@ config MMC_SDHCI_S3C
          often referrered to as the HSMMC block in some of the Samsung S3C
          range of SoC.
 
-         Note, due to the problems with DMA, the DMA support is only
-         available with CONFIG_EXPERIMENTAL is selected.
-
          If you have a controller with this interface, say Y or M here.
 
          If unsure, say N.
@@ -221,7 +218,7 @@ config MMC_SDHCI_SPEAR
 
 config MMC_SDHCI_S3C_DMA
        bool "DMA support on S3C SDHCI"
-       depends on MMC_SDHCI_S3C && EXPERIMENTAL
+       depends on MMC_SDHCI_S3C
        help
          Enable DMA support on the Samsung S3C SDHCI glue. The DMA
          has proved to be problematic if the controller encounters
@@ -318,8 +315,8 @@ config MMC_MXS
          If unsure, say N.
 
 config MMC_TIFM_SD
-       tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PCI
+       tristate "TI Flash Media MMC/SD Interface support"
+       depends on PCI
        select TIFM_CORE
        help
          Say Y here if you want to be able to access MMC/SD cards with
@@ -398,8 +395,7 @@ config MMC_S3C_PIO
          the S3C MCI driver.
 
 config MMC_S3C_DMA
-       bool "Use DMA transfers only (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Use DMA transfers only"
        help
          Use DMA to transfer data between memory and the hardare.
 
@@ -408,7 +404,7 @@ config MMC_S3C_DMA
          option is useful.
 
 config MMC_S3C_PIODMA
-       bool "Support for both PIO and DMA (EXPERIMENTAL)"
+       bool "Support for both PIO and DMA"
        help
          Compile both the PIO and DMA transfer routines into the
          driver and let the platform select at run-time which one
@@ -419,8 +415,8 @@ config MMC_S3C_PIODMA
 endchoice
 
 config MMC_SDRICOH_CS
-       tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PCI && PCMCIA
+       tristate "MMC/SD driver for Ricoh Bay1Controllers"
+       depends on 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.