aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-31 21:35:04 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-31 21:35:04 -0800
commit500156a0f0e81e24991f5f0db56e859db1fbdacf (patch)
tree0167cb28731e2c6fd7da2ea21f301312eea6504a /drivers/mmc/Kconfig
parent5b67e8dd5ae889fea7d01b905a570fa9a37b8785 (diff)
parentc65631781eb0f2e81865017c1484e9aef76e1b61 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Pass -DDEBUG on compiler command line if MMC_DEBUG selected [MMC] Add OMAP MMC host driver
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