diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
| commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
| tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /drivers/gpio/gpiolib.h | |
| parent | drm: add kernel doc for exported gem dmabuf_ops (diff) | |
| parent | BackMerge tag 'v4.15-rc8' into drm-next (diff) | |
| download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.xz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip | |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
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 */ |