From patchwork Mon Mar 14 14:25:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 559 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:43:42 -0000 Delivered-To: patches@linaro.org Received: by 10.224.45.75 with SMTP id d11cs61884qaf; Mon, 14 Mar 2011 09:42:00 -0700 (PDT) Received: by 10.223.143.5 with SMTP id s5mr3892904fau.23.1300120907285; Mon, 14 Mar 2011 09:41:47 -0700 (PDT) Received: from pig2.dooz.org (pig2.dooz.org [88.191.118.219]) by mx.google.com with ESMTPS id i7si8670953faa.3.2011.03.14.09.41.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Mar 2011 09:41:47 -0700 (PDT) Received-SPF: neutral (google.com: 88.191.118.219 is neither permitted nor denied by domain of lool@dooz.org) client-ip=88.191.118.219; Authentication-Results: mx.google.com; spf=neutral (google.com: 88.191.118.219 is neither permitted nor denied by domain of lool@dooz.org) smtp.mail=lool@dooz.org Received: from bee.dooz.org (serris.dooz.org [88.166.229.232]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "bee.dooz.org", Issuer "CA Cert Signing Authority" (verified OK)) by pig2.dooz.org (Postfix) with ESMTPS id 1AA74C06B6 for ; Mon, 14 Mar 2011 16:41:50 +0000 (UTC) Received: by bee.dooz.org (Postfix, from userid 1000) id C5DD7FB1B; Mon, 14 Mar 2011 17:41:42 +0100 (CET) Resent-From: =?iso-8859-1?Q?Lo=EFc?= Minier Resent-Date: Mon, 14 Mar 2011 17:41:42 +0100 Resent-Message-ID: <20110314164142.GJ18358@bee.dooz.org> Resent-To: patches@linaro.org X-Original-To: lool@dooz.org Received: from mombin.canonical.com (mombin.canonical.com [91.189.95.16]) by pig.zood.org (Postfix) with ESMTP id C5CC64C0D0 for ; Mon, 14 Mar 2011 15:23:48 +0100 (CET) Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Pz8gU-0004lV-Cu; Mon, 14 Mar 2011 14:23:46 +0000 Received: from mail-pw0-f42.google.com ([209.85.160.42]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Pz8gT-0004kn-1S for linaro-dev@lists.linaro.org; Mon, 14 Mar 2011 14:23:45 +0000 Received: by pwj3 with SMTP id 3so1275338pwj.1 for ; Mon, 14 Mar 2011 07:23:44 -0700 (PDT) Received: by 10.142.9.36 with SMTP id 36mr1631777wfi.125.1300112624019; Mon, 14 Mar 2011 07:23:44 -0700 (PDT) Received: from localhost.localdomain ([114.216.146.145]) by mx.google.com with ESMTPS id x11sm3671251wfd.1.2011.03.14.07.23.38 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Mar 2011 07:23:43 -0700 (PDT) From: Shawn Guo To: devicetree-discuss@lists.ozlabs.org, linaro-dev@lists.linaro.org Subject: [PATCH 3/7] mmc: make the reference to sdhci_tegra_dt_pdata conditional Date: Mon, 14 Mar 2011 22:25:55 +0800 Message-Id: <1300112759-3495-4-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1300112759-3495-1-git-send-email-shawn.guo@linaro.org> References: <1300112759-3495-1-git-send-email-shawn.guo@linaro.org> Cc: nicolas.pitre@linaro.org X-BeenThere: linaro-dev@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linaro Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linaro-dev-bounces@lists.linaro.org Errors-To: linaro-dev-bounces@lists.linaro.org Wrap tegra dt_id with CONFIG_MMC_SDHCI_TEGRA to make the reference to sdhci_tegra_dt_pdata conditional, otherwise it will stop build for other mmc driver when OF is enabled. Signed-off-by: Shawn Guo --- drivers/mmc/host/sdhci-pltfm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index ccc04ac..4125fbf 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -52,7 +52,9 @@ static struct sdhci_ops sdhci_pltfm_ops = { #if defined(CONFIG_OF) #include static const struct of_device_id sdhci_dt_ids[] = { +#ifdef CONFIG_MMC_SDHCI_TEGRA { .compatible = "nvidia,tegra250-sdhci", .data = &sdhci_tegra_dt_pdata }, +#endif { } }; MODULE_DEVICE_TABLE(platform, sdhci_dt_ids);