From b1e20265a6050ef6b74a2071f383d57fc20e678f Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Mar 2012 11:49:22 -0800
Subject: [PATCH] --- yaml --- r: 295565 b: refs/heads/master c:
 e48f814e6366d36a0495f6aa2838a064304f6406 h: refs/heads/master i:   295563:
 0aecdbd6e56ce789810775c3ac6d6e78558582ff 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 e63fd88b9a4b..f6ddc9e12df2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eaa7bb0b363707db6d1323e4fbc0783bc55d22d
+refs/heads/master: e48f814e6366d36a0495f6aa2838a064304f6406
diff --git a/trunk/arch/arm/mach-omap2/io.c b/trunk/arch/arm/mach-omap2/io.c
index 9bd07f33eea7..3fbb0c0b84a4 100644
--- a/trunk/arch/arm/mach-omap2/io.c
+++ b/trunk/arch/arm/mach-omap2/io.c
@@ -49,7 +49,7 @@
  * default mapping provided here.
  */
 
-#ifdef CONFIG_ARCH_OMAP2
+#if defined(CONFIG_SOC_OMAP2420) || defined(CONFIG_SOC_OMAP2430)
 static struct map_desc omap24xx_io_desc[] __initdata = {
 	{
 		.virtual	= L3_24XX_VIRT,