From 398985152f9816a81fe6669861d8b84711d14fb8 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Tue, 6 Nov 2007 04:55:27 -0800 Subject: [PATCH] Work around OMAP2_CTRL_BASE warnings in 3430 build Work around OMAP2_CTRL_BASE redefinition warnings for OMAP3430 builds. Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- include/asm-arm/arch-omap/omap24xx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.41.1