From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 6 Nov 2007 12:55:27 +0000 (-0800)
Subject: Work around OMAP2_CTRL_BASE warnings in 3430 build
X-Git-Tag: v2.6.24-omap1~238
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=398985152f9816a81fe6669861d8b84711d14fb8;p=linux-2.6-omap-h63xx.git

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 48738dc919f..1eb574974e4 100644
--- 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