summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-21 09:40:39 +0100
committerLinus Walleij <linus.walleij@linaro.org>2015-12-21 09:41:57 +0100
commit0202a111f8cc7abf9b45e6f555a707fda1fab6ab (patch)
treea1c128085d20d84dddaebdb817bdc4d77534b8e3 /drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
parentMerge tag 'v4.4-rc5' into devel (diff)
downloadlinux-0202a111f8cc7abf9b45e6f555a707fda1fab6ab.tar.xz
linux-0202a111f8cc7abf9b45e6f555a707fda1fab6ab.zip
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>
Diffstat (limited to 'drivers/pinctrl/bcm/pinctrl-iproc-gpio.c')
-rw-r--r--drivers/pinctrl/bcm/pinctrl-iproc-gpio.c2
1 files changed, 1 insertions, 1 deletions
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);
}