diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 18:06:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 18:06:37 -0700 |
| commit | eb3bbf805f8509f03ee479becf8c2f00737e1efb (patch) | |
| tree | 90ea306a044f4a1788dc87f94411d8572856279d /drivers/mmc/host/Kconfig | |
| parent | 5e8530810805858892959b8ebbcec1009ea8c12d (diff) | |
| parent | eba3f13716740c8a4bc12a987d3391a3c1f79e66 (diff) | |
| download | blackbird-op-linux-eb3bbf805f8509f03ee479becf8c2f00737e1efb.tar.gz blackbird-op-linux-eb3bbf805f8509f03ee479becf8c2f00737e1efb.zip | |
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 If unsure, say N. -config MMC_MSM7X00A - tristate "Qualcomm MSM 7X00A SDCC Controller Support" - depends on MMC && ARCH_MSM && !ARCH_MSM7X30 +config MMC_MSM + tristate "Qualcomm SDCC Controller Support" + depends on MMC && ARCH_MSM help This provides support for the SD/MMC cell found in the - MSM 7X00A controllers from Qualcomm. + MSM and QSD SOCs from Qualcomm. The controller also has + support for SDIO devices. config MMC_MXC tristate "Freescale i.MX2/3 Multimedia Card Interface support" |
