Commit 86147c84 authored by Kees Cook's avatar Kees Cook

drivers/mmc/host: remove depends on CONFIG_EXPERIMENTAL

The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

CC: Chris Ball <cjb@laptop.org>
CC: Sascha Hauer <s.hauer@pengutronix.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
CC: Manuel Lauss <manuel.lauss@googlemail.com>
CC: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarChris Ball <cjb@laptop.org>
parent 9c905faa
...@@ -69,7 +69,7 @@ config MMC_SDHCI_PCI ...@@ -69,7 +69,7 @@ config MMC_SDHCI_PCI
If unsure, say N. If unsure, say N.
config MMC_RICOH_MMC config MMC_RICOH_MMC
bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" bool "Ricoh MMC Controller Disabler"
depends on MMC_SDHCI_PCI depends on MMC_SDHCI_PCI
help help
This adds a pci quirk to disable Ricoh MMC Controller. This This adds a pci quirk to disable Ricoh MMC Controller. This
...@@ -186,9 +186,6 @@ config MMC_SDHCI_S3C ...@@ -186,9 +186,6 @@ config MMC_SDHCI_S3C
often referrered to as the HSMMC block in some of the Samsung S3C often referrered to as the HSMMC block in some of the Samsung S3C
range of SoC. 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 you have a controller with this interface, say Y or M here.
If unsure, say N. If unsure, say N.
...@@ -233,7 +230,7 @@ config MMC_SDHCI_SPEAR ...@@ -233,7 +230,7 @@ config MMC_SDHCI_SPEAR
config MMC_SDHCI_S3C_DMA config MMC_SDHCI_S3C_DMA
bool "DMA support on S3C SDHCI" bool "DMA support on S3C SDHCI"
depends on MMC_SDHCI_S3C && EXPERIMENTAL depends on MMC_SDHCI_S3C
help help
Enable DMA support on the Samsung S3C SDHCI glue. The DMA Enable DMA support on the Samsung S3C SDHCI glue. The DMA
has proved to be problematic if the controller encounters has proved to be problematic if the controller encounters
...@@ -330,8 +327,8 @@ config MMC_MXS ...@@ -330,8 +327,8 @@ config MMC_MXS
If unsure, say N. If unsure, say N.
config MMC_TIFM_SD config MMC_TIFM_SD
tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" tristate "TI Flash Media MMC/SD Interface support"
depends on EXPERIMENTAL && PCI depends on PCI
select TIFM_CORE select TIFM_CORE
help help
Say Y here if you want to be able to access MMC/SD cards with Say Y here if you want to be able to access MMC/SD cards with
...@@ -410,8 +407,7 @@ config MMC_S3C_PIO ...@@ -410,8 +407,7 @@ config MMC_S3C_PIO
the S3C MCI driver. the S3C MCI driver.
config MMC_S3C_DMA config MMC_S3C_DMA
bool "Use DMA transfers only (EXPERIMENTAL)" bool "Use DMA transfers only"
depends on EXPERIMENTAL
help help
Use DMA to transfer data between memory and the hardare. Use DMA to transfer data between memory and the hardare.
...@@ -420,7 +416,7 @@ config MMC_S3C_DMA ...@@ -420,7 +416,7 @@ config MMC_S3C_DMA
option is useful. option is useful.
config MMC_S3C_PIODMA config MMC_S3C_PIODMA
bool "Support for both PIO and DMA (EXPERIMENTAL)" bool "Support for both PIO and DMA"
help help
Compile both the PIO and DMA transfer routines into the Compile both the PIO and DMA transfer routines into the
driver and let the platform select at run-time which one driver and let the platform select at run-time which one
...@@ -431,8 +427,8 @@ config MMC_S3C_PIODMA ...@@ -431,8 +427,8 @@ config MMC_S3C_PIODMA
endchoice endchoice
config MMC_SDRICOH_CS config MMC_SDRICOH_CS
tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)" tristate "MMC/SD driver for Ricoh Bay1Controllers"
depends on EXPERIMENTAL && PCI && PCMCIA depends on PCI && PCMCIA
help help
Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA
card whenever you insert a MMC or SD card into the card slot. card whenever you insert a MMC or SD card into the card slot.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment