Skip to content

Commit

Permalink
drivers/mmc/host: remove depends on CONFIG_EXPERIMENTAL
Browse files Browse the repository at this point in the history
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: Kees Cook <keescook@chromium.org>
Acked-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent 9c905fa commit 86147c8
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions drivers/mmc/host/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -186,9 +186,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.
Expand Down Expand Up @@ -233,7 +230,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
Expand Down Expand Up @@ -330,8 +327,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
Expand Down Expand Up @@ -410,8 +407,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.

Expand All @@ -420,7 +416,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
Expand All @@ -431,8 +427,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.
Expand Down

0 comments on commit 86147c8

Please sign in to comment.