Commit 29c7f1f5 authored May 30, 2014 by Linus Walleij

pinctrl: sirf: fix a bad conflict resolution



Commit 294d1351
"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>

parent 697787a1

drivers/pinctrl/sirf/pinctrl-sirf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}