From patchwork Mon Nov 26 10:56:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1801721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id F1636DF230 for ; Mon, 26 Nov 2012 10:59:09 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TcwMH-0003iA-NT; Mon, 26 Nov 2012 10:56:14 +0000 Received: from haggis.tip.net.au ([2402:b800:7003:1::20] helo=members.tip.net.au) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TcwMC-0003fp-S9 for linux-arm-kernel@lists.infradead.org; Mon, 26 Nov 2012 10:56:10 +0000 Received: from canb.auug.org.au (ash.rothwell.emu.id.au [IPv6:2402:b800:7003:7010:223:14ff:fe30:c8e4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 44B41164087; Mon, 26 Nov 2012 21:56:06 +1100 (EST) Date: Mon, 26 Nov 2012 21:56:00 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Subject: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Message-Id: <20121126215600.236b2e44ffea1abbea26898b@canb.auug.org.au> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121126_055609_707275_9D684B0F X-CRM114-Status: GOOD ( 21.99 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lokesh Vutla , Tony Lindgren , Tomi Valkeinen , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 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 --- 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 #include -#include - #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();