diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 03:06:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 03:06:37 +0200 |
| commit | eb3bbf805f8509f03ee479becf8c2f00737e1efb (patch) | |
| tree | 90ea306a044f4a1788dc87f94411d8572856279d /drivers/mmc/host/Makefile | |
| parent | Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM (diff) | |
| download | linux-eb3bbf805f8509f03ee479becf8c2f00737e1efb.tar.xz 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/Makefile')
| -rw-r--r-- | drivers/mmc/host/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index fe0ba4e2b8b0..840bcb52d82f 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -21,7 +21,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 |