diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2017-11-09 03:36:07 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-11-09 03:36:07 -0500 |
commit | 9e9355bb2096c3a9e8baa2ff2e09ac43eeeadc72 (patch) | |
tree | 20424a2bd3983fdcb73fb38d6d2638cd96650f4b | |
parent | ec47873e1f29223d949aab69f7820c09f1b65f9d (diff) |
pinctrl: bcm2835: Fix some merge fallout
Fixing a small merge problem in BCM2835 related to the
new irqchip code.
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index fb85ab3cf662..72d122748293 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c | |||
@@ -383,7 +383,7 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc, | |||
383 | /* FIXME: no clue why the code looks up the type here */ | 383 | /* FIXME: no clue why the code looks up the type here */ |
384 | type = pc->irq_type[gpio]; | 384 | type = pc->irq_type[gpio]; |
385 | 385 | ||
386 | generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.irqdomain, | 386 | generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain, |
387 | gpio)); | 387 | gpio)); |
388 | } | 388 | } |
389 | } | 389 | } |