From patchwork Mon Apr 8 16:51:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 2410361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 844413FC71 for ; Mon, 8 Apr 2013 16:51:53 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPFIM-0001TN-9s; Mon, 08 Apr 2013 16:51:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPFIH-0003Tm-Nj; Mon, 08 Apr 2013 16:51:45 +0000 Received: from mail-oa0-f74.google.com ([209.85.219.74]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPFIF-0003TV-Cl for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2013 16:51:44 +0000 Received: by mail-oa0-f74.google.com with SMTP id k14so1508352oag.1 for ; Mon, 08 Apr 2013 09:51:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=TCLJ/SlAyveYGW+DtIy6c/SHa3JPypHdkng0+dHnROY=; b=oln1gJHL3TONSgXWaAtypM+heBWPcArBLp046f9J0ZH0mxnzFJRPZBXkjPAjZIIcwE qVfFhvbHr7wMYrg5RkrMrbmxZLywOFRzqSjBwVOBCGvktiXBDO3SLA/N43Af04ZI7BH7 6Jzk1Hj2a/laTpLXij8dlm3owAIDsHMZ2JKw+Kw8bpM8thtbRxPV877ljSQPjEC3e9lL YND1Yt8E3tDBbQEzHoY7btzBvBb0P6lA2jh1pw8anRfsqgoObFQLTyaR0kM+OHYR4X7q ZRAmS1EM51qwgo6DeWBV5aCIosVH9H0kflYD2dDshjo4u75taQoShxcskDlKfEz7sNw4 lzow== X-Received: by 10.42.31.196 with SMTP id a4mr16838546icd.4.1365439901343; Mon, 08 Apr 2013 09:51:41 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id hn12si1667622igb.3.2013.04.08.09.51.40 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 08 Apr 2013 09:51:41 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 7BFA25A415E; Mon, 8 Apr 2013 09:51:40 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 07AF6810C9; Mon, 8 Apr 2013 09:51:39 -0700 (PDT) From: Doug Anderson To: Kukjin Kim Subject: [PATCH] ARM: dts: fix bad merge of display timing node to exynos5250-smdk5250.dts Date: Mon, 8 Apr 2013 09:51:19 -0700 Message-Id: <1365439879-3398-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1.3 X-Gm-Message-State: ALoCoQl0ykQUlGYAWFjKxuomnufi/BqSH5YoUXxwyRfgo9oQF0Q+u+3qqJGWOHAr/umxZ8VvwcrY+0d7jj0Zqgq87ieXkjxGONg2fEfBF2VCvu3pb50pXUohPs0zOMdRrjFErOmqhwPnyHB5fItMFwXY+6dg/P9v4PbmmY8bh0BSeh5c/zSIYLV3ZPgjTwBajJvwD14RwyxJ/NzbCzYe4LLfIjXZmbExbw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130408_125143_468170_3225F6A2 X-CRM114-Status: UNSURE ( 9.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.2 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.74 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -2.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, Russell King , Leela Krishna Amudala , Jingoo Han , Doug Anderson , linux-kernel@vger.kernel.org, Thomas Abraham , Olof Johansson , linux-arm-kernel@lists.infradead.org, Rahul Sharma X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The display timing node was added: 7ed2077 ARM: dts: Add display timing node to exynos5250-smdk5250.dts ...and looks OK there. ...but it looks like we lost a "};" in the merge and it no longer compiles. Fix it. Signed-off-by: Doug Anderson --- arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 4be14df..26d856b 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -239,6 +239,7 @@ vback-porch = <4>; vfront-porch = <4>; vsync-len = <4>; + }; }; fixed-rate-clocks {