summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-05-30 09:52:43 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-05-30 09:52:43 +0200
commit29c7f1f53bfb3770bdb65a9e79064a963dd40621 (patch)
tree69dcf9d002907f0ba9926f8a8aca8bf1869bc33f
parent697787a16cae17f96a38e4ec82d9301457ada215 (diff)
pinctrl: sirf: fix a bad conflict resolutionpinctrl-v3.16-1
Commit 294d1351ff47726f0f110b88e816cbafe89512fb "pinctrl: sirf: switch to using allocated state container" caused a build conflict due to a bad conflict resolution when cherry-picking the patch. Fix it up. Cc: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/sirf/pinctrl-sirf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index 0e835219c42e..014f5b1fee55 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -575,7 +575,7 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc)
int i;
for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
- bank = &sgpio_chip.sgpio_bank[i];
+ bank = &sgpio->sgpio_bank[i];
if (bank->parent_irq == irq)
break;
}