From patchwork Fri Sep 6 01:01:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 273003 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ED1C2C02EF for ; Fri, 6 Sep 2013 11:02:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774Ab3IFBC0 (ORCPT ); Thu, 5 Sep 2013 21:02:26 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:42276 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753006Ab3IFBCZ (ORCPT ); Thu, 5 Sep 2013 21:02:25 -0400 Received: by mail-pb0-f44.google.com with SMTP id xa7so2516155pbc.3 for ; Thu, 05 Sep 2013 18:02:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PT74tHVT7p4dnaXuURDhnLpg9XE3+4dWBeC18C00Uzs=; b=IfYs15EUU7fY066nIQtxKjbMBIjU9UipgripztBQxDMWjkSglpRpfwwe6BZRX9BE+m 5KZAUUZ2XsgbpVIaelu1/kkorqE0csfra6HXlEQQ8zLdMzWZqZn05jGeK0jr+ywSfnh+ JFdymWcAtSMCFIL01imajs0theVK3bZIelU+2XY3ezTLl9oANJa70mU1FH7SeS/aic/w K/1sXcIFvTxVnaJkG0scnteyF/hY+da2VnRyabwc5G87GYwIH5yHiI3xPhAOpN5N54rw KExeAPjVqcEUJwfVn8UO9P95keLgubXwyjOjq9h8PyMoJc4qEbpGggA2MwuPFiZ39lns ekbg== X-Gm-Message-State: ALoCoQkesPdEFXxvG2MVmtqerQZbroDqWDmuaOSQEQlNjJNN4IhkJnOqvdE7kk6Wvo4M2Ehegi7A X-Received: by 10.68.137.1 with SMTP id qe1mr12392345pbb.25.1378429344498; Thu, 05 Sep 2013 18:02:24 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id fy4sm38562134pbb.1.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Sep 2013 18:02:23 -0700 (PDT) From: Olof Johansson To: torvalds@linux-foundation.org Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, Olof Johansson Subject: [PATCH] net: stmmac: fix bad merge conflict resolution Date: Thu, 5 Sep 2013 18:01:41 -0700 Message-Id: <1378429301-19964-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 In-Reply-To: <20130905.163725.106795517693348522.davem@davemloft.net> References: <20130905.163725.106795517693348522.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Merge commit 06c54055bebf919249aa1eb68312887c3cfe77b4 did a bad conflict resolution accidentally leaving out a closing brace. Add it back. Signed-off-by: Olof Johansson --- This breaks a handful of defconfigs on ARM, so it'd be good to see it applied pretty quickly. Thanks! -Olof drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 7a00720..51c9069 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -87,6 +87,7 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, if (plat->force_thresh_dma_mode) { plat->force_sf_dma_mode = 0; pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set."); + } return 0; }