[PATCH] pinctrl: bcm/cygnys/iproc: fixup rebase issue

Linus Walleij linus.walleij at linaro.org
Mon Dec 21 00:42:17 PST 2015


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

Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
Reported-by: Pramod Kumar <pramodku at broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
---
 drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the linux-arm-kernel mailing list