diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:06:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:06:37 -0400 |
| commit | eb3bbf805f8509f03ee479becf8c2f00737e1efb (patch) | |
| tree | 90ea306a044f4a1788dc87f94411d8572856279d /drivers/mmc/host/Kconfig | |
| parent | 5e8530810805858892959b8ebbcec1009ea8c12d (diff) | |
| parent | eba3f13716740c8a4bc12a987d3391a3c1f79e66 (diff) | |
Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM
mmc: msm_sdcc: Compile the driver for msm7x30
mmc: msm: fix up build breakage on !PM
Diffstat (limited to 'drivers/mmc/host/Kconfig')
| -rw-r--r-- | drivers/mmc/host/Kconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index c997474c649f..283190bc2a40 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
| @@ -256,12 +256,13 @@ config MMC_IMX | |||
| 256 | 256 | ||
| 257 | If unsure, say N. | 257 | If unsure, say N. |
| 258 | 258 | ||
| 259 | config MMC_MSM7X00A | 259 | config MMC_MSM |
| 260 | tristate "Qualcomm MSM 7X00A SDCC Controller Support" | 260 | tristate "Qualcomm SDCC Controller Support" |
| 261 | depends on MMC && ARCH_MSM && !ARCH_MSM7X30 | 261 | depends on MMC && ARCH_MSM |
| 262 | help | 262 | help |
| 263 | This provides support for the SD/MMC cell found in the | 263 | This provides support for the SD/MMC cell found in the |
| 264 | MSM 7X00A controllers from Qualcomm. | 264 | MSM and QSD SOCs from Qualcomm. The controller also has |
| 265 | support for SDIO devices. | ||
| 265 | 266 | ||
| 266 | config MMC_MXC | 267 | config MMC_MXC |
| 267 | tristate "Freescale i.MX2/3 Multimedia Card Interface support" | 268 | tristate "Freescale i.MX2/3 Multimedia Card Interface support" |