From: Paul Parsons Date: Thu, 30 Jun 2011 15:50:12 +0000 (-0400) Subject: mmc: tmio: Fix build error without CONFIG_MMC_SDHI X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d6fec69d0da640366e1f0a0df092757d46821b10;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git mmc: tmio: Fix build error without CONFIG_MMC_SDHI Only compile tmio_mmc_dma.o when CONFIG_MMC_SDHI is selected (as y or m). Signed-off-by: Paul Parsons Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index cf9533021f9e..b4b83f302e32 100644 --- a/drivers/mmc/host/Makefile +++ b/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