---

yaml --- r: 255195 b: refs/heads/master c: d6fec69 h: refs/heads/master i: 255193: fe66fc6 255191: f90ca04 v: v3
git-mirror · Jul 20, 2011 · 1070e17 · 1070e17
1 parent e967bba
commit 1070e17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34b664a20e2664de0d0d7990ca60276b96c08c75
+refs/heads/master: d6fec69d0da640366e1f0a0df092757d46821b10
diff --git a/trunk/drivers/mmc/host/Makefile b/trunk/drivers/mmc/host/Makefile
@@ -32,9 +32,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
 obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
 obj-$(CONFIG_MMC_TMIO_CORE)	+= tmio_mmc_core.o
 tmio_mmc_core-y			:= tmio_mmc_pio.o
-ifneq ($(CONFIG_MMC_SDHI),n)
-tmio_mmc_core-y			+= tmio_mmc_dma.o
-endif
+tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_SDHI))	+= tmio_mmc_dma.o
 obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o
 obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o
 obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o