Work around OMAP2_CTRL_BASE warnings in 3430 build

Work around OMAP2_CTRL_BASE redefinition warnings for OMAP3430 builds.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 48738dc919fe1449d6ca0af22cf4f919265ce60e..1eb574974e489947ca7b3b928a879d1cf12747a4 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -101,7 +101,7 @@
 #define OMAP2_VA_IC_BASE       IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP2_CTRL_BASE                OMAP243X_CTRL_BASE
 
-#else
+#elif !defined(CONFIG_ARCH_OMAP34XX)
 /* FIXME: These will go away soon */
 #define OMAP2_CTRL_BASE                L4_24XX_BASE
 #endif