Searched hist:ae0755b5 (Results 1 – 1 of 1) sorted by relevance
/openbmc/linux/include/linux/gpio/ |
H A D | driver.h | ae0755b5 Thu Sep 05 04:20:25 CDT 2019 Linus Walleij <linus.walleij@linaro.org> gpio: Fix up merge collision in include file
The merge of two different patch sets cleaning around in the main driver include file collided making the function declarations for gpiochip_[un]lock_as_irq() be defined twice when gpiolib was unselected. Fix it up.
Cc: YueHaibing <yuehaibing@huawei.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> ae0755b5 Thu Sep 05 04:20:25 CDT 2019 Linus Walleij <linus.walleij@linaro.org> gpio: Fix up merge collision in include file The merge of two different patch sets cleaning around in the main driver include file collided making the function declarations for gpiochip_[un]lock_as_irq() be defined twice when gpiolib was unselected. Fix it up. Cc: YueHaibing <yuehaibing@huawei.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|