| Message ID | 1355626132-32117-1-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Javier Martinez Canillas <javier.martinez@collabora.co.uk> [121215 18:52]: > commit 966458f OMAP: remove vram allocator > > Removed the OMAP specific vram allocator but OMAP2 common was > still trying to use it and this lead to the following build error: > > CC arch/arm/mach-omap2/common.o > arch/arm/mach-omap2/common.c:19:23: fatal error: plat/vram.h: No such file or directory > compilation terminated. > make[1]: *** [arch/arm/mach-omap2/common.o] Error 1 > make: *** [arch/arm/mach-omap2] Error 2 OK looks like this got missed in the merge notes from Tomi, will apply. Thanks, Ton > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > --- > arch/arm/mach-omap2/common.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c > index 5c2fd48..2dabb9e 100644 > --- a/arch/arm/mach-omap2/common.c > +++ b/arch/arm/mach-omap2/common.c > @@ -16,8 +16,6 @@ > #include <linux/init.h> > #include <linux/platform_data/dsp-omap.h> > > -#include <plat/vram.h> > - > #include "common.h" > #include "omap-secure.h" > > @@ -32,7 +30,6 @@ int __weak omap_secure_ram_reserve_memblock(void) > > void __init omap_reserve(void) > { > - omap_vram_reserve_sdram_memblock(); > omap_dsp_reserve_sdram_memblock(); > omap_secure_ram_reserve_memblock(); > omap_barrier_reserve_memblock(); > -- > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 5c2fd48..2dabb9e 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -16,8 +16,6 @@ #include <linux/init.h> #include <linux/platform_data/dsp-omap.h> -#include <plat/vram.h> - #include "common.h" #include "omap-secure.h" @@ -32,7 +30,6 @@ int __weak omap_secure_ram_reserve_memblock(void) void __init omap_reserve(void) { - omap_vram_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock(); omap_secure_ram_reserve_memblock(); omap_barrier_reserve_memblock();
commit 966458f OMAP: remove vram allocator Removed the OMAP specific vram allocator but OMAP2 common was still trying to use it and this lead to the following build error: CC arch/arm/mach-omap2/common.o arch/arm/mach-omap2/common.c:19:23: fatal error: plat/vram.h: No such file or directory compilation terminated. make[1]: *** [arch/arm/mach-omap2/common.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> --- arch/arm/mach-omap2/common.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)