diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:32:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:32:55 -0700 |
| commit | ef7a4567dc542d8cc563755478464ea928fede41 (patch) | |
| tree | 6a9005cadbe8968adcf75204541d8fa6bbad5b2c /drivers/mmc/Kconfig | |
| parent | a2308b7f0838406c346a2b0259ff88c7fcf41e79 (diff) | |
| parent | 56ca904053ab14ba4067a72b69a5edf246771209 (diff) | |
| download | kernel_samsung_tuna-ef7a4567dc542d8cc563755478464ea928fede41.zip kernel_samsung_tuna-ef7a4567dc542d8cc563755478464ea928fede41.tar.gz kernel_samsung_tuna-ef7a4567dc542d8cc563755478464ea928fede41.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1
[ARM] 3456/1: AT91RM9200 support for 2.6 (MMC/SD driver)
Diffstat (limited to 'drivers/mmc/Kconfig')
| -rw-r--r-- | drivers/mmc/Kconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 7cc162e..003b077 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -91,4 +91,22 @@ config MMC_AU1X If unsure, say N. +config MMC_AT91RM9200 + tristate "AT91RM9200 SD/MMC Card Interface support" + depends on ARCH_AT91RM9200 && MMC + help + This selects the AT91RM9200 MCI controller. + + If unsure, say N. + +config MMC_IMX + tristate "Motorola i.MX Multimedia Card Interface support" + depends on ARCH_IMX && MMC + help + This selects the Motorola i.MX Multimedia card Interface. + If you have a i.MX platform with a Multimedia Card slot, + say Y or M here. + + If unsure, say N. + endmenu |