aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorSahitya Tummala <stummala@codeaurora.org>2010-07-29 07:28:01 -0400
committerDaniel Walker <dwalker@codeaurora.org>2010-08-09 19:06:04 -0400
commiteba3f13716740c8a4bc12a987d3391a3c1f79e66 (patch)
tree22a38e70ca1aef65798b7b4b74a75aea0e271bed /drivers/mmc
parentedd4dd0e987919ed672376c5c73c32aacfc24f39 (diff)
mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM
SD/MMC host controller driver is same for all MSM and QSD platforms. Hence, rename the config to reflect the same. Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/Kconfig7
-rw-r--r--drivers/mmc/host/Makefile2
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index e171e77f6129..2167e2f69170 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -247,12 +247,13 @@ config MMC_IMX
247 247
248 If unsure, say N. 248 If unsure, say N.
249 249
250config MMC_MSM7X00A 250config MMC_MSM
251 tristate "Qualcomm MSM 7X00A SDCC Controller Support" 251 tristate "Qualcomm SDCC Controller Support"
252 depends on MMC && ARCH_MSM 252 depends on MMC && ARCH_MSM
253 help 253 help
254 This provides support for the SD/MMC cell found in the 254 This provides support for the SD/MMC cell found in the
255 MSM 7X00A controllers from Qualcomm. 255 MSM and QSD SOCs from Qualcomm. The controller also has
256 support for SDIO devices.
256 257
257config MMC_MXC 258config MMC_MXC
258 tristate "Freescale i.MX2/3 Multimedia Card Interface support" 259 tristate "Freescale i.MX2/3 Multimedia Card Interface support"
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index e30c2ee48894..deb19186ff2e 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o
22obj-$(CONFIG_MMC_AT91) += at91_mci.o 22obj-$(CONFIG_MMC_AT91) += at91_mci.o
23obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o 23obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o
24obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o 24obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
25obj-$(CONFIG_MMC_MSM7X00A) += msm_sdcc.o 25obj-$(CONFIG_MMC_MSM) += msm_sdcc.o
26obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o 26obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o
27obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o 27obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o
28obj-$(CONFIG_MMC_SPI) += mmc_spi.o 28obj-$(CONFIG_MMC_SPI) += mmc_spi.o