From patchwork Sun May 15 13:24:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Parsons X-Patchwork-Id: 785992 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 p4FDOt1V030572 for ; Sun, 15 May 2011 13:24:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753343Ab1EONYy (ORCPT ); Sun, 15 May 2011 09:24:54 -0400 Received: from relay.pcl-ipout02.plus.net ([212.159.7.100]:26800 "EHLO relay.pcl-ipout02.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754153Ab1EONYy (ORCPT ); Sun, 15 May 2011 09:24:54 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqEhABrTz01UXeb6/2dsb2JhbACCM4JmkkYxjgV3uSkChhuJHg6GCwSUQIQchio Received: from outmx05.plus.net ([84.93.230.250]) by relay.pcl-ipout02.plus.net with ESMTP; 15 May 2011 14:24:53 +0100 Received: from [81.174.194.16] (helo=paul) by outmx05.plus.net with esmtp (Exim) id 1QLbJV-0007eN-AF; Sun, 15 May 2011 14:24:53 +0100 Subject: [PATCH] mmc: tmio: Fix build errors From: "Paul Parsons" To: Cc: Date: Sun, 15 May 2011 13:24:52 +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]); Sun, 15 May 2011 13:24:55 +0000 (UTC) Conditional code in tmio_mmc.h selects dummy tmio_mmc_start_dma(), tmio_mmc_request_dma() and tmio_mmc_release_dma() inline functions instead of the required declarations. This breaks the build of tmio_mmc_dma.c 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 diff -uprN clean-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h linux-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h --- clean-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h 2011-05-11 00:54:17.647289808 +0100 +++ linux-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h 2011-05-14 16:30:47.208267896 +0100 @@ -98,26 +98,8 @@ static inline void tmio_mmc_kunmap_atomi local_irq_restore(*flags); } -#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) void tmio_mmc_start_dma(struct tmio_mmc_host *host, struct mmc_data *data); void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata); void tmio_mmc_release_dma(struct tmio_mmc_host *host); -#else -static inline void tmio_mmc_start_dma(struct tmio_mmc_host *host, - struct mmc_data *data) -{ -} - -static inline void tmio_mmc_request_dma(struct tmio_mmc_host *host, - struct tmio_mmc_data *pdata) -{ - host->chan_tx = NULL; - host->chan_rx = NULL; -} - -static inline void tmio_mmc_release_dma(struct tmio_mmc_host *host) -{ -} -#endif #endif