pinctrl: bcm2835: Fix some merge fallout
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 9 Nov 2017 08:36:07 +0000 (09:36 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 9 Nov 2017 08:36:07 +0000 (09:36 +0100)
commit9e9355bb2096c3a9e8baa2ff2e09ac43eeeadc72
tree20424a2bd3983fdcb73fb38d6d2638cd96650f4b
parentec47873e1f29223d949aab69f7820c09f1b65f9d
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>
drivers/pinctrl/bcm/pinctrl-bcm2835.c