Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/common.c between commit b022e17b1c7e ("OMAP: common.c:
remove init call to vram") from the omap_dss2 tree and commit
f583f0f2c720 ("ARM: OMAP2+: Move omap_reserve() locally to mach-omap2")
from the arm-soc tree.I fixed it up (by deleting the file and adding the following patch) and can carry the fix as necessary (no action is required). From 523f2987a07f97c946c63e0be4558b8332b46e8f Mon Sep 17 00:00:00 2001 From: Stephen Rothwell <[email protected]> Date: Mon, 26 Nov 2012 21:51:20 +1100 Subject: [PATCH] OMAP: common.c: remove init call to vram fixup Signed-off-by: Stephen Rothwell <[email protected]> --- arch/arm/mach-omap2/common.c | 3 --- 1 file changed, 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.10.280.gaa39 -- Cheers, Stephen Rothwell [email protected]
pgpoQ4gFqDDjd.pgp
Description: PGP signature
