From: Sergei Shtylyov <sshtylyov@mvista.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
tony@atomide.com
Subject: Re: [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus
Date: Sat, 26 Feb 2011 18:05:52 +0300 [thread overview]
Message-ID: <4D6916D0.1080501@ru.mvista.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1102251839360.6198@utopia.booyaka.com>
Hello.
On 26-02-2011 4:40, Paul Walmsley wrote:
> On non-OMAP2 and non-OMAP3 kernel configs, turn omap2_sdrc_init() into
> a no-op. Otherwise, compilation breaks on an OMAP4-only config with
> the current omap-for-linus branch:
> arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_devices':
> ../mach-omap2/io.c:421: undefined reference to `omap2_sdrc_init'
> Signed-off-by: Paul Walmsley<paul@pwsan.com>
> Cc: Tony Lindgren<tony@atomide.com>
> ---
> arch/arm/plat-omap/include/plat/sdrc.h | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
> diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
> index efd87c8..5a44b14 100644
> --- a/arch/arm/plat-omap/include/plat/sdrc.h
> +++ b/arch/arm/plat-omap/include/plat/sdrc.h
> @@ -124,8 +124,13 @@ 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
> +#define omap2_sdrc_init(x, y) 0
How about empty inline instead?
> +#endif
> +
WBR, Sergei
next prev parent reply other threads:[~2011-02-26 15:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-26 1:40 [PATCH] OMAP2+: sdrc: fix compile break on OMAP4-only config on current omap-for-linus Paul Walmsley
2011-02-26 15:05 ` Sergei Shtylyov [this message]
2011-02-28 0:03 ` Paul Walmsley
2011-02-28 11:49 ` Sergei Shtylyov
2011-03-01 1:58 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D6916D0.1080501@ru.mvista.com \
--to=sshtylyov@mvista.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox