From: Tony Lindgren <tony@atomide.com>
Date: Fri, 6 Jun 2008 19:09:49 +0000 (-0700)
Subject: ARM: OMAP2: Make io.c safe for multi-omap
X-Git-Tag: v2.6.26-omap1~123^2~12
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e72546e2175057e1b4e8594d63a144a1ce315515;p=linux-2.6-omap-h63xx.git

ARM: OMAP2: Make io.c safe for multi-omap

ARM: OMAP2: Make io.c safe for multi-omap

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 2af0cdc80d5..314994b0707 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -171,12 +171,17 @@ void __init omap2_map_common_io(void)
 #if defined(CONFIG_ARCH_OMAP2420)
 	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
 	iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
-#elif defined(CONFIG_ARCH_OMAP2430)
+#endif
+
+#if defined(CONFIG_ARCH_OMAP2430)
 	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
 	iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
-#elif defined(CONFIG_ARCH_OMAP34XX)
+#endif
+
+#if defined(CONFIG_ARCH_OMAP34XX)
 	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
 #endif
+
 	/* Normally devicemaps_init() would flush caches and tlb after
 	 * mdesc->map_io(), but we must also do it here because of the CPU
 	 * revision check below.