diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-23 09:45:58 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-23 09:45:58 +0200 |
| commit | 973b659cbf2604b0b52829c224f6064d64118818 (patch) | |
| tree | b2929369b8d33b2083cba5bde8e32ea5deef1dae /arch/arm/plat-omap/common.c | |
| parent | f15511e23db4e1deb6bf6a3c88c04ba85434e142 (diff) | |
| parent | ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed (diff) | |
| download | blackbird-op-linux-973b659cbf2604b0b52829c224f6064d64118818.tar.gz blackbird-op-linux-973b659cbf2604b0b52829c224f6064d64118818.zip | |
Merge branch 'work/old-omapfb-removal'
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 06383b51e655..2081f0f578e5 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -15,7 +15,6 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/dma-mapping.h> -#include <linux/omapfb.h> #include <plat/common.h> #include <plat/board.h> @@ -65,7 +64,6 @@ const void *__init omap_get_var_config(u16 tag, size_t *len) void __init omap_reserve(void) { - omapfb_reserve_sdram_memblock(); omap_vram_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock(); omap_secure_ram_reserve_memblock(); |
