X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fio.c;h=8ea67bf196a5efd309d09760a13170003d75a20a;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=7d5711611f2f413cae141ec31fe9ccea382d234d;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 7d5711611..8ea67bf19 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -16,13 +16,9 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include <asm/tlb.h>
-#include <asm/io.h>
-
 #include <asm/mach/map.h>
-
+#include <asm/io.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
 
 extern void omap_sram_init(void);
 extern int omap2_clk_init(void);
@@ -47,24 +43,11 @@ static struct map_desc omap2_io_desc[] __initdata = {
 	}
 };
 
-void __init omap2_map_common_io(void)
+void __init omap_map_common_io(void)
 {
 	iotable_init(omap2_io_desc, ARRAY_SIZE(omap2_io_desc));
-
-	/* 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.
-	 */
-	local_flush_tlb_all();
-	flush_cache_all();
-
 	omap2_check_revision();
 	omap_sram_init();
-	omapfb_reserve_mem();
-}
-
-void __init omap2_init_common_hw(void)
-{
 	omap2_mux_init();
 	omap2_clk_init();
 }