ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Fri, 6 Jul 2012 09:25:42 +0000 (14:55 +0530)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 08:44:11 +0000 (01:44 -0700)
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 <tony@atomide.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/include/plat/sdrc.h

index 9bb978e..36d6a76 100644 (file)
@@ -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