diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /drivers/mmc/host/Kconfig | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 0efa390978bd..99d4b28d52ed 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
| @@ -145,6 +145,16 @@ config MMC_IMX | |||
| 145 | 145 | ||
| 146 | If unsure, say N. | 146 | If unsure, say N. |
| 147 | 147 | ||
| 148 | config MMC_MXC | ||
| 149 | tristate "Freescale i.MX2/3 Multimedia Card Interface support" | ||
| 150 | depends on ARCH_MXC | ||
| 151 | help | ||
| 152 | This selects the Freescale i.MX2/3 Multimedia card Interface. | ||
| 153 | If you have a i.MX platform with a Multimedia Card slot, | ||
| 154 | say Y or M here. | ||
| 155 | |||
| 156 | If unsure, say N. | ||
| 157 | |||
| 148 | config MMC_TIFM_SD | 158 | config MMC_TIFM_SD |
| 149 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" | 159 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" |
| 150 | depends on EXPERIMENTAL && PCI | 160 | depends on EXPERIMENTAL && PCI |