From e72546e2175057e1b4e8594d63a144a1ce315515 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 6 Jun 2008 12:09:49 -0700 Subject: [PATCH] ARM: OMAP2: Make io.c safe for multi-omap ARM: OMAP2: Make io.c safe for multi-omap Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/io.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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. -- 2.41.0