From patchwork Mon Dec 21 08:42:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 58774 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp2454622lbb; Mon, 21 Dec 2015 00:42:29 -0800 (PST) X-Received: by 10.98.13.84 with SMTP id v81mr25007152pfi.120.1450687349094; Mon, 21 Dec 2015 00:42:29 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 29si12012874pfq.140.2015.12.21.00.42.28; Mon, 21 Dec 2015 00:42:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751123AbbLUIm2 (ORCPT + 4 others); Mon, 21 Dec 2015 03:42:28 -0500 Received: from mail-lf0-f42.google.com ([209.85.215.42]:33998 "EHLO mail-lf0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949AbbLUIm1 (ORCPT ); Mon, 21 Dec 2015 03:42:27 -0500 Received: by mail-lf0-f42.google.com with SMTP id y184so106345746lfc.1 for ; Mon, 21 Dec 2015 00:42:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Zb5IXAxu29IkuakAjmja6flThOHeMdWAj/DO0ad/Q/E=; b=h+uGhi//IRWIeZ5PcnqF5bZBzCdt1oh6ULNEzVigdd1Yjuy7ouMImoJNnEzEOkIITJ rjgoubeIeAIoy0+X3h+KqofAYlVtizplPpDcMp+b03G+6Emnm9Pcobd8Ey1ZU3I64jJ8 9XJlkaPtWz1RHHsgAIiv60JkJSBNd9UuuujrQ= 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; bh=Zb5IXAxu29IkuakAjmja6flThOHeMdWAj/DO0ad/Q/E=; b=Ua6Vm0kZsD5eLk4nIY3JssoHvZAzhJbXTrUkao/ARHlDpmG/NDZN+1XLPCMT6pKuMH GzO29IV9L3fhwBt0JWNOyGximm1gLopRTm1RKgfhtwih4UzuQCTPIDaeQ8cnLa0Z1c3t ek+k1U2FLunXToKWM6bg817o+fnU3phOK0z6ZmM9Xg0gh0d011+rgyr81pxLB8BBcaPJ qH+sPN7koxfdh5srz5oLe0xhWgO58DlOdLyB5Z2FVzubxjamnuqukEQhSyyhySaR86RZ McKe4vCrJ47qkyRmQRILK/47wQ2aoxFszrho9cYaiDPKAT5glop4a1HC1O5FfWMvXTTp C7lw== X-Gm-Message-State: ALoCoQnNCEzVQhv3mA0tIkFa8LPJGdh2b7D6L/MMHi+DnuF41pSYnaZKMBELJfFfbKMecucWhdVrbW+uSN4C226NJYhxEP6nIA== X-Received: by 10.25.210.135 with SMTP id j129mr6013405lfg.101.1450687345667; Mon, 21 Dec 2015 00:42:25 -0800 (PST) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id nr3sm3823347lbb.38.2015.12.21.00.42.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Dec 2015 00:42:24 -0800 (PST) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH] pinctrl: bcm/cygnys/iproc: fixup rebase issue Date: Mon, 21 Dec 2015 09:42:17 +0100 Message-Id: <1450687337-16424-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Somehow this variable name screwed up in some rebase, fixed it. Reported-by: Stephen Rothwell Reported-by: Pramod Kumar Signed-off-by: Linus Walleij --- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c index 525ea138d9ca..314591a4609b 100644 --- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c @@ -637,7 +637,7 @@ static int iproc_gpio_register_pinconf(struct iproc_gpio *chip) return 0; } -static void iproc_gpio_unregister_pinconf(struct cygnus_gpio *chip) +static void iproc_gpio_unregister_pinconf(struct iproc_gpio *chip) { pinctrl_unregister(chip->pctl); }