]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0052ab42e0bb1771115e83746ce87bc86bf4a94b
treeb56dab8ee777bfd8a40001eaab25cb0cd5695f86
parentb1a24ce5821b49730611e8d1cae8859187d18ce1
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: b1a24ce5821b ("Merge tag 'v5.3-rc7' into devel")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpiolib.c