[cleanup-part2 PATCH] ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds.

Tony Lindgren tony at atomide.com
Mon Jul 9 04:45:19 EDT 2012


* Santosh Shilimkar <santosh.shilimkar at 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 at atomide.com>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar at 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
> 



More information about the linux-arm-kernel mailing list