From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 21 Dec 2015 08:40:39 +0000 (+0100)
Subject: pinctrl: bcm/cygnys/iproc: fixup rebase issue
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0202a111f8cc7abf9b45e6f555a707fda1fab6ab;p=deliverable%2Flinux.git

pinctrl: bcm/cygnys/iproc: fixup rebase issue

Somehow this variable name screwed up in some rebase, fixed it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Pramod Kumar <pramodku@broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

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);
 }