diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 11:20:25 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 11:20:25 +0200 |
| commit | ae0755b56da9db4190288155ea884331993ed51b (patch) | |
| tree | 76d90ecc68e6ae7671f67dd0de69027e8f633225 | |
| parent | f0d1ab0526408c28f40836254a5e7be794074b6d (diff) | |
| download | linux-ae0755b56da9db4190288155ea884331993ed51b.tar.gz | |
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>
| -rw-r--r-- | include/linux/gpio/driver.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index b74a3bee85e5..c667ad0c099d 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -702,11 +702,12 @@ void gpiochip_free_own_desc(struct gpio_desc *desc); void devprop_gpiochip_set_names(struct gpio_chip *chip, const struct fwnode_handle *fwnode); +#ifdef CONFIG_GPIOLIB + /* lock/unlock as IRQ */ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset); void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset); -#ifdef CONFIG_GPIOLIB struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc); |