aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/cpu.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:48 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:02 -0500
commita8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (patch)
tree86901095aeb9e59815a6f95547cf68a9ec0b32e0 /arch/arm/plat-omap/include/plat/cpu.h
parent088ef950dc0dd58d2f339e1616c9092fea923f06 (diff)
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
Replace ARCH_OMAP34XX with ARCH_OMAP3 Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/cpu.h')
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 527aaae61720..995466d0432a 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -114,7 +114,7 @@ unsigned int omap_rev(void);
114# define OMAP_NAME omap16xx 114# define OMAP_NAME omap16xx
115# endif 115# endif
116#endif 116#endif
117#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)) 117#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
118# if (defined(OMAP_NAME) || defined(MULTI_OMAP1)) 118# if (defined(OMAP_NAME) || defined(MULTI_OMAP1))
119# error "OMAP1 and OMAP2 can't be selected at the same time" 119# error "OMAP1 and OMAP2 can't be selected at the same time"
120# endif 120# endif
@@ -241,7 +241,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
241# define cpu_is_omap242x() is_omap242x() 241# define cpu_is_omap242x() is_omap242x()
242# define cpu_is_omap243x() is_omap243x() 242# define cpu_is_omap243x() is_omap243x()
243# endif 243# endif
244# if defined(CONFIG_ARCH_OMAP34XX) 244# if defined(CONFIG_ARCH_OMAP3)
245# undef cpu_is_omap34xx 245# undef cpu_is_omap34xx
246# undef cpu_is_omap343x 246# undef cpu_is_omap343x
247# define cpu_is_omap34xx() is_omap34xx() 247# define cpu_is_omap34xx() is_omap34xx()
@@ -260,7 +260,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
260# undef cpu_is_omap243x 260# undef cpu_is_omap243x
261# define cpu_is_omap243x() 1 261# define cpu_is_omap243x() 1
262# endif 262# endif
263# if defined(CONFIG_ARCH_OMAP34XX) 263# if defined(CONFIG_ARCH_OMAP3)
264# undef cpu_is_omap34xx 264# undef cpu_is_omap34xx
265# define cpu_is_omap34xx() 1 265# define cpu_is_omap34xx() 1
266# endif 266# endif
@@ -385,7 +385,7 @@ IS_OMAP_TYPE(3517, 0x3517)
385# define cpu_is_omap2430() is_omap2430() 385# define cpu_is_omap2430() is_omap2430()
386#endif 386#endif
387 387
388#if defined(CONFIG_ARCH_OMAP34XX) 388#if defined(CONFIG_ARCH_OMAP3)
389# undef cpu_is_omap3430 389# undef cpu_is_omap3430
390# undef cpu_is_omap3503 390# undef cpu_is_omap3503
391# undef cpu_is_omap3515 391# undef cpu_is_omap3515