From patchwork Thu Jun 30 04:59:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 931612 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5U4xOxp031074 for ; Thu, 30 Jun 2011 04:59:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750958Ab1F3E7X (ORCPT ); Thu, 30 Jun 2011 00:59:23 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:51252 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888Ab1F3E7W (ORCPT ); Thu, 30 Jun 2011 00:59:22 -0400 Received: by gyh3 with SMTP id 3so740657gyh.19 for ; Wed, 29 Jun 2011 21:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=zBbM3G+uLCrmjECrrtEEWw66I8Ioz0N6/pBDBEvmtrg=; b=GWexdNnGT5U53LUd3b/nUg8XzNQZjmcuDXTa/r17kCUTjGB6z7Ky00B8gnYHXADJBC LQj1YtxstXDAmslodHFSzo7nn06Bhu1bKrMPB0DTycP852+90GEA49NICOyVYKxbAaq/ vTeLBjKq8RcCYgRpFiENDQWexT1qZcqflfEX8= Received: by 10.236.186.38 with SMTP id v26mr1966450yhm.415.1309409961627; Wed, 29 Jun 2011 21:59:21 -0700 (PDT) Received: from [218.172.235.135] (218-172-235-135.dynamic.hinet.net [218.172.235.135]) by mx.google.com with ESMTPS id e24sm1418026yhk.65.2011.06.29.21.59.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Jun 2011 21:59:21 -0700 (PDT) Subject: [PATCH] mmc: tmio: fix build error if CONFIG_MMC_SDHI is not configured From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Ian Molton , Chris Ball , Guennadi Liakhovetski , linux-mmc@vger.kernel.org Date: Thu, 30 Jun 2011 12:59:16 +0800 Message-ID: <1309409956.10500.3.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 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]); Thu, 30 Jun 2011 04:59:24 +0000 (UTC) Fix below build error: CC drivers/mmc/host/tmio_mmc_dma.o drivers/mmc/host/tmio_mmc_dma.c:192: error: redefinition of 'tmio_mmc_start_dma' drivers/mmc/host/tmio_mmc.h:111: error: previous definition of 'tmio_mmc_start_dma' was here drivers/mmc/host/tmio_mmc_dma.c:257: error: redefinition of 'tmio_mmc_request_dma' drivers/mmc/host/tmio_mmc.h:116: error: previous definition of 'tmio_mmc_request_dma' was here drivers/mmc/host/tmio_mmc_dma.c:305: error: redefinition of 'tmio_mmc_release_dma' drivers/mmc/host/tmio_mmc.h:122: error: previous definition of 'tmio_mmc_release_dma' was here make[3]: *** [drivers/mmc/host/tmio_mmc_dma.o] Error 1 make[2]: *** [drivers/mmc/host] Error 2 make[1]: *** [drivers/mmc] Error 2 make: *** [drivers] Error 2 Signed-off-by: Axel Lin --- drivers/mmc/host/tmio_mmc_dma.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c index a40fdba..4dc563a 100644 --- a/drivers/mmc/host/tmio_mmc_dma.c +++ b/drivers/mmc/host/tmio_mmc_dma.c @@ -189,6 +189,7 @@ pio: desc, cookie); } +#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) void tmio_mmc_start_dma(struct tmio_mmc_host *host, struct mmc_data *data) { @@ -200,6 +201,7 @@ void tmio_mmc_start_dma(struct tmio_mmc_host *host, tmio_mmc_start_dma_tx(host); } } +#endif static void tmio_mmc_issue_tasklet_fn(unsigned long priv) { @@ -254,6 +256,7 @@ static bool tmio_mmc_filter(struct dma_chan *chan, void *arg) return true; } +#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata) { /* We can only either use DMA for both Tx and Rx or not use it at all */ @@ -319,3 +322,4 @@ void tmio_mmc_release_dma(struct tmio_mmc_host *host) host->bounce_buf = NULL; } } +#endif