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
 
           If unsure, say N.
 
-config MMC_MSM7X00A
-        tristate "Qualcomm MSM 7X00A SDCC Controller Support"
+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"
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
 obj-$(CONFIG_MMC_AT91)          += at91_mci.o
 obj-$(CONFIG_MMC_ATMELMCI)      += atmel-mci.o
 obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
-obj-$(CONFIG_MMC_MSM7X00A)      += msm_sdcc.o
+obj-$(CONFIG_MMC_MSM)           += msm_sdcc.o
 obj-$(CONFIG_MMC_MVSDIO)        += mvsdio.o
 obj-$(CONFIG_MMC_DAVINCI)       += davinci_mmc.o
 obj-$(CONFIG_MMC_SPI)           += mmc_spi.o