diff options
author | Dave Airlie <airlied@redhat.com> | 2018-01-18 00:32:15 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-01-18 00:32:15 +0100 |
commit | 4a6cc7a44e98a0460bd094b68c75f0705fdc450a (patch) | |
tree | b8c86a1e0342b1166ab52c4d79e404eede57abec /drivers/gpio/gpiolib.h | |
parent | Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
parent | Linux 4.15-rc8 (diff) | |
download | linux-4a6cc7a44e98a0460bd094b68c75f0705fdc450a.tar.xz linux-4a6cc7a44e98a0460bd094b68c75f0705fdc450a.zip |
BackMerge tag 'v4.15-rc8' into drm-next
Linux 4.15-rc8
Daniel requested this for so the intel CI won't fall over on drm-next
so often.
Diffstat (limited to 'drivers/gpio/gpiolib.h')
-rw-r--r-- | drivers/gpio/gpiolib.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index af48322839c3..6c44d1652139 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -228,7 +228,8 @@ static inline int gpio_chip_hwgpio(const struct gpio_desc *desc) return desc - &desc->gdev->descs[0]; } -void devprop_gpiochip_set_names(struct gpio_chip *chip); +void devprop_gpiochip_set_names(struct gpio_chip *chip, + const struct fwnode_handle *fwnode); /* With descriptor prefix */ |