From patchwork Tue Feb 12 14:55:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2128621 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3120A3FCA4 for ; Tue, 12 Feb 2013 14:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761244Ab3BLOzk (ORCPT ); Tue, 12 Feb 2013 09:55:40 -0500 Received: from moutng.kundenserver.de ([212.227.17.9]:52394 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761236Ab3BLOzg (ORCPT ); Tue, 12 Feb 2013 09:55:36 -0500 Received: from axis700.grange (dslb-094-221-125-058.pools.arcor-ip.net [94.221.125.58]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MPIp6-1U0rQL3PW4-004a8y; Tue, 12 Feb 2013 15:55:34 +0100 Received: by axis700.grange (Postfix, from userid 1000) id 6A78440B99; Tue, 12 Feb 2013 15:55:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 6825640B98; Tue, 12 Feb 2013 15:55:33 +0100 (CET) Date: Tue, 12 Feb 2013 15:55:33 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Simon Horman cc: linux-sh@vger.kernel.org Subject: [PATCH 1/2] ARM: shmobile: fix a syntax error in sh73a0.dtsi from a bad merge In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:nF5DGzAUaoNk4peTgjmDA9/PZRkQ3085P9XBJ4XAujZ kWPkErfuytMoBP9ZBL4aQDihMxG7GZn2cq+ALqONvu/sCg1pD/ UGpmZH75t9y1+a+c8aBx1g8aTK1tTppH4cs50yL0dP34kRtBPe CqQl9thuTJ/6Tg5AUWBiZxT4F9BAq8j/DupXxz5YUkAW/M2t0a PxC3QKKiGvihM9YzGB8yqqjgAax9X58kCzcR6TSe+vordnGyIQ pAzQGfiUuFUbN6UVNDc7gzNNUk8YoZLtBh3fyN0PEsIi9lWisy mBIYM70lX1CCuDxg31Or5ITB9RvLKECyG0h0KhStqEcxWozaMX pW8Yqk5NwzmY9Hk2apiWjB2SOVcNyEjJPCaY0LbJYjXFcEd6a9 O/NqzPjd2EVOw== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org A semicolon went missing in the merge commit 6dffe18b5dbe1e3d5ccf1792a4793c854bad7e87 Merge: 95c746f 68c80f0 Author: Simon Horman Date: Thu Feb 7 17:23:58 2013 +0900 Merge branch 'topic/pfc' into topic/all+next Signed-off-by: Guennadi Liakhovetski --- arch/arm/boot/dts/sh73a0.dtsi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index ebbd604..c97edb2 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -35,5 +35,5 @@ <0xe605801c 0x1c>; gpio-controller; #gpio-cells = <2>; - } + }; };