Skip to content


pinctrl: sirf: fix a bad conflict resolution
Browse files Browse the repository at this point in the history
Commit 294d135
"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 <>
Signed-off-by: Linus Walleij <>
  • Loading branch information
linusw committed May 30, 2014
1 parent 697787a commit 29c7f1f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pinctrl/sirf/pinctrl-sirf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 29c7f1f

Please sign in to comment.