diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /drivers/mmc/host/Kconfig | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'drivers/mmc/host/Kconfig')
| -rw-r--r-- | drivers/mmc/host/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index dfa585f7feaf..0efa390978bd 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
| @@ -76,6 +76,16 @@ config MMC_OMAP | |||
| 76 | 76 | ||
| 77 | If unsure, say N. | 77 | If unsure, say N. |
| 78 | 78 | ||
| 79 | config MMC_OMAP_HS | ||
| 80 | tristate "TI OMAP High Speed Multimedia Card Interface support" | ||
| 81 | depends on ARCH_OMAP2430 || ARCH_OMAP3 | ||
| 82 | help | ||
| 83 | This selects the TI OMAP High Speed Multimedia card Interface. | ||
| 84 | If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot, | ||
| 85 | say Y or M here. | ||
| 86 | |||
| 87 | If unsure, say N. | ||
| 88 | |||
| 79 | config MMC_WBSD | 89 | config MMC_WBSD |
| 80 | tristate "Winbond W83L51xD SD/MMC Card Interface support" | 90 | tristate "Winbond W83L51xD SD/MMC Card Interface support" |
| 81 | depends on ISA_DMA_API | 91 | depends on ISA_DMA_API |