From patchwork Tue May 17 10:39:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Parsons X-Patchwork-Id: 791192 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4HAdFQH013981 for ; Tue, 17 May 2011 10:39:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999Ab1EQKjP (ORCPT ); Tue, 17 May 2011 06:39:15 -0400 Received: from relay.ptn-ipout01.plus.net ([212.159.7.35]:13867 "EHLO relay.ptn-ipout01.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752232Ab1EQKjO (ORCPT ); Tue, 17 May 2011 06:39:14 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AkoqAB5Q0k3Unw4T/2dsb2JhbACCNYJmkj8xjg13tx4Ch0mJHg6GCwSUQIQchio Received: from outmx04.plus.net ([212.159.14.19]) by relay.ptn-ipout01.plus.net with ESMTP; 17 May 2011 11:39:13 +0100 Received: from [87.115.2.39] (helo=paul) by outmx04.plus.net with esmtp (Exim) id 1QMHgG-0005TP-JM; Tue, 17 May 2011 11:39:12 +0100 Subject: [PATCH v2] mmc: tmio: Fix build errors From: "Paul Parsons" To: Cc: , Date: Tue, 17 May 2011 10:39:11 +0000 Mime-Version: 1.0 X-Mailer: email v2.5.0 (Linux 2.6.38 x86_64 [http://email.cleancode.org]) Message-Id: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 17 May 2011 10:39:16 +0000 (UTC) Only compile tmio_mmc_dma.o when CONFIG_MMC_SDHI is selected (as y or m). Signed-off-by: Paul Parsons --- -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- clean-2.6.39-rc7/drivers/mmc/host/Makefile 2011-05-17 01:53:37.280446658 +0100 +++ linux-2.6.39-rc7/drivers/mmc/host/Makefile 2011-05-17 02:15:56.959621818 +0100 @@ -31,9 +31,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_ 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