From 13fb66ebb388f9d2a2834c6ecbebf359d8d3b788 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 14 Dec 2010 19:17:31 -0800
Subject: [PATCH] --- yaml --- r: 226490 b: refs/heads/master c:
 df127ee375af4cb40b979605e0c336fc79bd38e7 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-omap2/io.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e68eaf7d4bd1..85548e8dd5bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79b357c2171ab3e52148503f0efa66d64a13413e
+refs/heads/master: df127ee375af4cb40b979605e0c336fc79bd38e7
diff --git a/trunk/arch/arm/mach-omap2/io.c b/trunk/arch/arm/mach-omap2/io.c
index 9804385533e5..534774146ead 100644
--- a/trunk/arch/arm/mach-omap2/io.c
+++ b/trunk/arch/arm/mach-omap2/io.c
@@ -320,7 +320,7 @@ static inline void omap_irq_base_init(void)
 	extern void __iomem *omap_irq_base;
 
 #ifdef MULTI_OMAP2
-	if (cpu_is_omap242x())
+	if (cpu_is_omap24xx())
 		omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE);
 	else if (cpu_is_omap34xx())
 		omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE);