summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-01 14:29:12 -0500
committerJeff Garzik <jeff@garzik.org>2006-04-01 14:29:12 -0500
commit6e07e16404deafadf45895a7d2aeb5feba53b479 (patch)
treea7025d6632f0b3eb6232eafba79f331ead812fcf /drivers/mmc/Kconfig
parent08a556db919f67e1e4d33ae8d40f7222da34d994 (diff)
parente8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff)
downloadkernel-crypto-6e07e16404deafadf45895a7d2aeb5feba53b479.tar.gz
kernel-crypto-6e07e16404deafadf45895a7d2aeb5feba53b479.tar.xz
kernel-crypto-6e07e16404deafadf45895a7d2aeb5feba53b479.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/mmc/Kconfig')
-rw-r--r--drivers/mmc/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 3f5d77f633f..7cc162e8978 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -60,6 +60,17 @@ config MMC_SDHCI
If unsure, say N.
+config MMC_OMAP
+ tristate "TI OMAP Multimedia Card Interface support"
+ depends on ARCH_OMAP && MMC
+ select TPS65010 if MACH_OMAP_H2
+ help
+ This selects the TI OMAP Multimedia card Interface.
+ If you have an OMAP board with a Multimedia Card slot,
+ say Y or M here.
+
+ If unsure, say N.
+
config MMC_WBSD
tristate "Winbond W83L51xD SD/MMC Card Interface support"
depends on MMC && ISA_DMA_API