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:47 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:01 -0500
commit088ef950dc0dd58d2f339e1616c9092fea923f06 (patch)
tree4901dd1855d101f2d4c84c1d297edb4e9404ffcd /arch/arm/plat-omap/include/plat/cpu.h
parentd10f2b6e745f1232ff6517b335faf3bfd7005bec (diff)
omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2
Convert ARCH_OMAP24XX to ARCH_OMAP2 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 ccd78fd473d1..527aaae61720 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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)) 117#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX))
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
@@ -233,7 +233,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
233#endif 233#endif
234 234
235#if defined(MULTI_OMAP2) 235#if defined(MULTI_OMAP2)
236# if defined(CONFIG_ARCH_OMAP24XX) 236# if defined(CONFIG_ARCH_OMAP2)
237# undef cpu_is_omap24xx 237# undef cpu_is_omap24xx
238# undef cpu_is_omap242x 238# undef cpu_is_omap242x
239# undef cpu_is_omap243x 239# undef cpu_is_omap243x
@@ -248,7 +248,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
248# define cpu_is_omap343x() is_omap343x() 248# define cpu_is_omap343x() is_omap343x()
249# endif 249# endif
250#else 250#else
251# if defined(CONFIG_ARCH_OMAP24XX) 251# if defined(CONFIG_ARCH_OMAP2)
252# undef cpu_is_omap24xx 252# undef cpu_is_omap24xx
253# define cpu_is_omap24xx() 1 253# define cpu_is_omap24xx() 1
254# endif 254# endif
@@ -374,7 +374,7 @@ IS_OMAP_TYPE(3517, 0x3517)
374# define cpu_is_omap1710() is_omap1710() 374# define cpu_is_omap1710() is_omap1710()
375#endif 375#endif
376 376
377#if defined(CONFIG_ARCH_OMAP24XX) 377#if defined(CONFIG_ARCH_OMAP2)
378# undef cpu_is_omap2420 378# undef cpu_is_omap2420
379# undef cpu_is_omap2422 379# undef cpu_is_omap2422
380# undef cpu_is_omap2423 380# undef cpu_is_omap2423