diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-omap2/io.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 210de9d292fb..b9ea70bce563 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <plat/sdrc.h> | 32 | #include <plat/sdrc.h> |
| 33 | #include <plat/gpmc.h> | 33 | #include <plat/gpmc.h> |
| 34 | #include <plat/serial.h> | 34 | #include <plat/serial.h> |
| 35 | #include <plat/vram.h> | ||
| 36 | 35 | ||
| 37 | #include "clock2xxx.h" | 36 | #include "clock2xxx.h" |
| 38 | #include "clock3xxx.h" | 37 | #include "clock3xxx.h" |
| @@ -241,8 +240,6 @@ static void __init _omap2_map_common_io(void) | |||
| 241 | 240 | ||
| 242 | omap2_check_revision(); | 241 | omap2_check_revision(); |
| 243 | omap_sram_init(); | 242 | omap_sram_init(); |
| 244 | omapfb_reserve_sdram(); | ||
| 245 | omap_vram_reserve_sdram(); | ||
| 246 | } | 243 | } |
| 247 | 244 | ||
| 248 | #ifdef CONFIG_ARCH_OMAP2420 | 245 | #ifdef CONFIG_ARCH_OMAP2420 |