gpio: Fix further merge errors
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 6 Sep 2019 10:05:35 +0000 (12:05 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 6 Sep 2019 10:05:35 +0000 (12:05 +0200)
commitfbdf8d4bef4917713e7ec2fc006041a2b449605a
treeb56dab8ee777bfd8a40001eaab25cb0cd5695f86
parent151a41014bff92f353263cadc051435dc9c3258e
gpio: Fix further merge errors

The previous merge of v5.3-rc7 was struggle enough, now it
gave rise to new errors and now I fix those too.

Fixes: 151a41014bff ("Merge tag 'v5.3-rc7' into devel")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpiolib.c