diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 12:20:25 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 12:20:25 +0300 |
| commit | ae0755b56da9db4190288155ea884331993ed51b (patch) | |
| tree | 76d90ecc68e6ae7671f67dd0de69027e8f633225 /include/linux/memcontrol.h | |
| parent | f0d1ab0526408c28f40836254a5e7be794074b6d (diff) | |
| download | linux-ae0755b56da9db4190288155ea884331993ed51b.tar.xz | |
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>
Diffstat (limited to 'include/linux/memcontrol.h')
0 files changed, 0 insertions, 0 deletions