diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-01 00:35:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-01 00:35:04 -0500 |
| commit | 500156a0f0e81e24991f5f0db56e859db1fbdacf (patch) | |
| tree | 0167cb28731e2c6fd7da2ea21f301312eea6504a /drivers/mmc/Kconfig | |
| parent | 5b67e8dd5ae889fea7d01b905a570fa9a37b8785 (diff) | |
| parent | c65631781eb0f2e81865017c1484e9aef76e1b61 (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/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 3f5d77f633fa..7cc162e8978b 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig | |||
| @@ -60,6 +60,17 @@ config MMC_SDHCI | |||
| 60 | 60 | ||
| 61 | If unsure, say N. | 61 | If unsure, say N. |
| 62 | 62 | ||
| 63 | config MMC_OMAP | ||
| 64 | tristate "TI OMAP Multimedia Card Interface support" | ||
| 65 | depends on ARCH_OMAP && MMC | ||
| 66 | select TPS65010 if MACH_OMAP_H2 | ||
| 67 | help | ||
| 68 | This selects the TI OMAP Multimedia card Interface. | ||
| 69 | If you have an OMAP board with a Multimedia Card slot, | ||
| 70 | say Y or M here. | ||
| 71 | |||
| 72 | If unsure, say N. | ||
| 73 | |||
| 63 | config MMC_WBSD | 74 | config MMC_WBSD |
| 64 | tristate "Winbond W83L51xD SD/MMC Card Interface support" | 75 | tristate "Winbond W83L51xD SD/MMC Card Interface support" |
| 65 | depends on MMC && ISA_DMA_API | 76 | depends on MMC && ISA_DMA_API |