commit 140455fa007a618d2d1bf5e6e888206534035e6f
author Tony Lindgren <tony@atomide.com> Fri Feb 12 12:26:48 2010 -0800
committer Tony Lindgren <tony@atomide.com> Mon Feb 15 09:27:04 2010 -0800
tree de32228b71e7992ad95a00756daaa2f527043c8f
parent a8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9

omap2/3/4: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS

omap: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS

Signed-off-by: Tony Lindgren <tony@atomide.com>

arch/arm/plat-omap/include/plat/control.h

diff --git a/arch/arm/plat-omap/include/plat/control.h b/arch/arm/plat-omap/include/plat/control.h
index 61e7b8a..fcdc71b 100644
--- a/arch/arm/plat-omap/include/plat/control.h
+++ b/arch/arm/plat-omap/include/plat/control.h
@@ -309,8 +309,7 @@
 
 
 #ifndef __ASSEMBLY__
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
-		defined(CONFIG_ARCH_OMAP4)
+#ifdef CONFIG_ARCH_OMAP2PLUS
 extern void __iomem *omap_ctrl_base_get(void);
 extern u8 omap_ctrl_readb(u16 offset);
 extern u16 omap_ctrl_readw(u16 offset);