diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
| commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 (patch) | |
| tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 /drivers/gpio/gpio-it87.c | |
| parent | 043477b088d2af61a0937754c6560002237e6741 (diff) | |
| parent | 0ab390262c4920f26f8202063a268d5fc829728e (diff) | |
| download | linux-53f071e19d566e7d0a4eada1bd8313a4cdb660a4.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpio/gpio-it87.c')
| -rw-r--r-- | drivers/gpio/gpio-it87.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-it87.c b/drivers/gpio/gpio-it87.c index efb46edff81f..7cad14d3f127 100644 --- a/drivers/gpio/gpio-it87.c +++ b/drivers/gpio/gpio-it87.c @@ -31,7 +31,7 @@ #include <linux/errno.h> #include <linux/ioport.h> #include <linux/slab.h> -#include <linux/gpio.h> +#include <linux/gpio/driver.h> /* Chip Id numbers */ #define NO_DEV_ID 0xffff |