* [PATCH 1/1] ARM: OMAP2+: common: remove use of vram
@ 2012-12-16 2:48 Javier Martinez Canillas
2012-12-16 17:48 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Javier Martinez Canillas @ 2012-12-16 2:48 UTC (permalink / raw)
To: Tony Lindgren
Cc: Russell King, Tomi Valkeinen, linux-omap, linux-arm-kernel,
linux-kernel, Javier Martinez Canillas
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] ARM: OMAP2+: common: remove use of vram
2012-12-16 2:48 [PATCH 1/1] ARM: OMAP2+: common: remove use of vram Javier Martinez Canillas
@ 2012-12-16 17:48 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2012-12-16 17:48 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: Russell King, Tomi Valkeinen, linux-omap, linux-arm-kernel, linux-kernel
* 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-16 17:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-16 2:48 [PATCH 1/1] ARM: OMAP2+: common: remove use of vram Javier Martinez Canillas
2012-12-16 17:48 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).