From 1070e179e02d278fdd121212986590f097babab9 Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Thu, 30 Jun 2011 11:50:12 -0400 Subject: [PATCH] --- yaml --- r: 255195 b: refs/heads/master c: d6fec69d0da640366e1f0a0df092757d46821b10 h: refs/heads/master i: 255193: fe66fc67cfc3ebf9a0f6ed8a9cd18bee762366b4 255191: f90ca044e7d836784a077b08dd49e73106871176 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/Makefile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 40a5b8f40d64..670ba2e1ee92 100644 --- 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 index cf9533021f9e..b4b83f302e32 100644 --- 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