Merge branch 'devel-map-io' into omap-for-linus

This commit is contained in:
Tony Lindgren
2010-08-04 14:43:45 +03:00
514 changed files with 18478 additions and 6618 deletions

View File

@@ -32,7 +32,6 @@
#include <plat/sdrc.h>
#include <plat/gpmc.h>
#include <plat/serial.h>
#include <plat/vram.h>
#include "clock2xxx.h"
#include "clock3xxx.h"
@@ -241,8 +240,6 @@ static void __init _omap2_map_common_io(void)
omap2_check_revision();
omap_sram_init();
omapfb_reserve_sdram();
omap_vram_reserve_sdram();
}
#ifdef CONFIG_ARCH_OMAP2420