aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-02 14:17:47 -0400
committerKees Cook <keescook@chromium.org>2013-01-11 14:38:06 -0500
commit86147c84c666549e3191b4acadddd783bcd88e0a (patch)
tree46833cd930336e60ffcc12032df50ffff3ab04fa /drivers/mmc/host
parent9c905faa6f711b86e2ff3915cf70f80a82a07f90 (diff)
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: Kees Cook <keescook@chromium.org> Acked-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/Kconfig20
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 8d13c6594520..cc8a8fad455a 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -69,7 +69,7 @@ config MMC_SDHCI_PCI
69 If unsure, say N. 69 If unsure, say N.
70 70
71config MMC_RICOH_MMC 71config MMC_RICOH_MMC
72 bool "Ricoh MMC Controller Disabler (EXPERIMENTAL)" 72 bool "Ricoh MMC Controller Disabler"
73 depends on MMC_SDHCI_PCI 73 depends on MMC_SDHCI_PCI
74 help 74 help
75 This adds a pci quirk to disable Ricoh MMC Controller. This 75 This adds a pci quirk to disable Ricoh MMC Controller. This
@@ -186,9 +186,6 @@ config MMC_SDHCI_S3C
186 often referrered to as the HSMMC block in some of the Samsung S3C 186 often referrered to as the HSMMC block in some of the Samsung S3C
187 range of SoC. 187 range of SoC.
188 188
189 Note, due to the problems with DMA, the DMA support is only
190 available with CONFIG_EXPERIMENTAL is selected.
191
192 If you have a controller with this interface, say Y or M here. 189 If you have a controller with this interface, say Y or M here.
193 190
194 If unsure, say N. 191 If unsure, say N.
@@ -233,7 +230,7 @@ config MMC_SDHCI_SPEAR
233 230
234config MMC_SDHCI_S3C_DMA 231config MMC_SDHCI_S3C_DMA
235 bool "DMA support on S3C SDHCI" 232 bool "DMA support on S3C SDHCI"
236 depends on MMC_SDHCI_S3C && EXPERIMENTAL 233 depends on MMC_SDHCI_S3C
237 help 234 help
238 Enable DMA support on the Samsung S3C SDHCI glue. The DMA 235 Enable DMA support on the Samsung S3C SDHCI glue. The DMA
239 has proved to be problematic if the controller encounters 236 has proved to be problematic if the controller encounters
@@ -330,8 +327,8 @@ config MMC_MXS
330 If unsure, say N. 327 If unsure, say N.
331 328
332config MMC_TIFM_SD 329config MMC_TIFM_SD
333 tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" 330 tristate "TI Flash Media MMC/SD Interface support"
334 depends on EXPERIMENTAL && PCI 331 depends on PCI
335 select TIFM_CORE 332 select TIFM_CORE
336 help 333 help
337 Say Y here if you want to be able to access MMC/SD cards with 334 Say Y here if you want to be able to access MMC/SD cards with
@@ -410,8 +407,7 @@ config MMC_S3C_PIO
410 the S3C MCI driver. 407 the S3C MCI driver.
411 408
412config MMC_S3C_DMA 409config MMC_S3C_DMA
413 bool "Use DMA transfers only (EXPERIMENTAL)" 410 bool "Use DMA transfers only"
414 depends on EXPERIMENTAL
415 help 411 help
416 Use DMA to transfer data between memory and the hardare. 412 Use DMA to transfer data between memory and the hardare.
417 413
@@ -420,7 +416,7 @@ config MMC_S3C_DMA
420 option is useful. 416 option is useful.
421 417
422config MMC_S3C_PIODMA 418config MMC_S3C_PIODMA
423 bool "Support for both PIO and DMA (EXPERIMENTAL)" 419 bool "Support for both PIO and DMA"
424 help 420 help
425 Compile both the PIO and DMA transfer routines into the 421 Compile both the PIO and DMA transfer routines into the
426 driver and let the platform select at run-time which one 422 driver and let the platform select at run-time which one
@@ -431,8 +427,8 @@ config MMC_S3C_PIODMA
431endchoice 427endchoice
432 428
433config MMC_SDRICOH_CS 429config MMC_SDRICOH_CS
434 tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)" 430 tristate "MMC/SD driver for Ricoh Bay1Controllers"
435 depends on EXPERIMENTAL && PCI && PCMCIA 431 depends on PCI && PCMCIA
436 help 432 help
437 Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA 433 Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA
438 card whenever you insert a MMC or SD card into the card slot. 434 card whenever you insert a MMC or SD card into the card slot.