From: Tony Lindgren <tony@atomide.com>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [cleanup-part2 PATCH] ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds.
Date: Mon, 9 Jul 2012 01:45:19 -0700 [thread overview]
Message-ID: <20120709084519.GA1122@atomide.com> (raw)
In-Reply-To: <1341566742-22734-1-git-send-email-santosh.shilimkar@ti.com>
* Santosh Shilimkar <santosh.shilimkar@ti.com> [120706 02:30]:
> OMAP4 only build breaks with below error
>
> arch/arm/mach-omap2/sdrc.c:135: error: redefinition of 'omap2_sdrc_init'
> arch/arm/plat-omap/include/plat/sdrc.h:130: note: previous definition of 'omap2_sdrc_init' was here
> make[1]: *** [arch/arm/mach-omap2/sdrc.o] Error 1
>
> Fix the same by using newly introduced CONFIG_SOC_HAS_OMAP2_SDRC marco.
Thanks, applying into cleanup-part2.
Tony
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
> index 9bb978e..36d6a76 100644
> --- a/arch/arm/plat-omap/include/plat/sdrc.h
> +++ b/arch/arm/plat-omap/include/plat/sdrc.h
> @@ -123,7 +123,7 @@ struct omap_sdrc_params {
> u32 mr;
> };
>
> -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
> +#ifdef CONFIG_SOC_HAS_OMAP2_SDRC
> void omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
> struct omap_sdrc_params *sdrc_cs1);
> #else
> --
> 1.7.9.5
>
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [cleanup-part2 PATCH] ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds.
Date: Mon, 9 Jul 2012 01:45:19 -0700 [thread overview]
Message-ID: <20120709084519.GA1122@atomide.com> (raw)
In-Reply-To: <1341566742-22734-1-git-send-email-santosh.shilimkar@ti.com>
* Santosh Shilimkar <santosh.shilimkar@ti.com> [120706 02:30]:
> OMAP4 only build breaks with below error
>
> arch/arm/mach-omap2/sdrc.c:135: error: redefinition of 'omap2_sdrc_init'
> arch/arm/plat-omap/include/plat/sdrc.h:130: note: previous definition of 'omap2_sdrc_init' was here
> make[1]: *** [arch/arm/mach-omap2/sdrc.o] Error 1
>
> Fix the same by using newly introduced CONFIG_SOC_HAS_OMAP2_SDRC marco.
Thanks, applying into cleanup-part2.
Tony
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> arch/arm/plat-omap/include/plat/sdrc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h
> index 9bb978e..36d6a76 100644
> --- a/arch/arm/plat-omap/include/plat/sdrc.h
> +++ b/arch/arm/plat-omap/include/plat/sdrc.h
> @@ -123,7 +123,7 @@ struct omap_sdrc_params {
> u32 mr;
> };
>
> -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
> +#ifdef CONFIG_SOC_HAS_OMAP2_SDRC
> void omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
> struct omap_sdrc_params *sdrc_cs1);
> #else
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-07-09 8:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-06 9:25 [cleanup-part2 PATCH] ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds Santosh Shilimkar
2012-07-06 9:25 ` Santosh Shilimkar
2012-07-09 8:45 ` Tony Lindgren [this message]
2012-07-09 8:45 ` 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=20120709084519.GA1122@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=santosh.shilimkar@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.