From: Santosh Shilimkar Date: Fri, 6 Jul 2012 09:25:42 +0000 (+0530) Subject: ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds X-Git-Tag: firefly_0821_release~3680^2~2390^2~2^2 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fb584511c4664573097ece7df0de06ad00b713a2;p=firefly-linux-kernel-4.4.55.git ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds 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. Cc: Tony Lindgren Signed-off-by: Santosh Shilimkar Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/include/plat/sdrc.h b/arch/arm/plat-omap/include/plat/sdrc.h index 9bb978ecd884..36d6a7666216 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