summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/control.h
diff options
context:
space:
mode:
authorTony Lindgren2010-02-12 21:26:48 +0100
committerTony Lindgren2010-02-15 18:27:04 +0100
commit140455fa007a618d2d1bf5e6e888206534035e6f (patch)
treede32228b71e7992ad95a00756daaa2f527043c8f /arch/arm/plat-omap/include/plat/control.h
parentomap3: Replace ARCH_OMAP34XX with ARCH_OMAP3 (diff)
downloadkernel-qcow2-linux-140455fa007a618d2d1bf5e6e888206534035e6f.tar.gz
kernel-qcow2-linux-140455fa007a618d2d1bf5e6e888206534035e6f.tar.xz
kernel-qcow2-linux-140455fa007a618d2d1bf5e6e888206534035e6f.zip
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>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/control.h')
-rw-r--r--arch/arm/plat-omap/include/plat/control.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/control.h b/arch/arm/plat-omap/include/plat/control.h
index 61e7b8a8c993..fcdc71bf4c6e 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);