From patchwork Mon Feb 28 00:03:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 593861 X-Patchwork-Delegate: tony@atomide.com 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 p1S02NU9022418 for ; Mon, 28 Feb 2011 00:03:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908Ab1B1ADQ (ORCPT ); Sun, 27 Feb 2011 19:03:16 -0500 Received: from utopia.booyaka.com ([72.9.107.138]:56843 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833Ab1B1ADP (ORCPT ); Sun, 27 Feb 2011 19:03:15 -0500 Received: (qmail 12031 invoked by uid 1019); 28 Feb 2011 00:03:14 -0000 Date: Sun, 27 Feb 2011 17:03:14 -0700 (MST) From: Paul Walmsley To: Sergei Shtylyov , tony@atomide.com cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus In-Reply-To: <4D6916D0.1080501@ru.mvista.com> Message-ID: References: <4D6916D0.1080501@ru.mvista.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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]); Mon, 28 Feb 2011 00:03:16 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h index efd87c8..2a34a65 100644 --- a/arch/arm/plat-omap/include/plat/sdrc.h +++ b/arch/arm/plat-omap/include/plat/sdrc.h @@ -124,8 +124,14 @@ struct omap_sdrc_params { u32 mr; }; +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); +#else +static inline void __init omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0, + struct omap_sdrc_params *sdrc_cs1) {}; +#endif + int omap2_sdrc_get_params(unsigned long r, struct omap_sdrc_params **sdrc_cs0, struct omap_sdrc_params **sdrc_cs1);