diff options
| author | Maxime Ripard <mripard@kernel.org> | 2019-10-03 10:00:13 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2019-10-03 10:00:13 +0200 |
| commit | b6559bf3ac32acfe34e17c73d68581e7f7415785 (patch) | |
| tree | abd998cfc150195cb9e80d314175ffc86f7ac761 | |
| parent | Merge drm/drm-fixes into drm-misc-fixes (diff) | |
| parent | drm/tilcdc: include linux/pinctrl/consumer.h again (diff) | |
| download | linux-b6559bf3ac32acfe34e17c73d68581e7f7415785.tar.gz linux-b6559bf3ac32acfe34e17c73d68581e7f7415785.zip | |
Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixes
One tilcdc fix was left out in drm-misc-next-fixes and didn't make it
during the merge window. Let's bring it into drm-misc-fixes.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c index 525dc1c0f1c1..530edb3b51cc 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c @@ -7,6 +7,7 @@ #include <linux/gpio.h> #include <linux/mod_devicetable.h> #include <linux/of_gpio.h> +#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <drm/drm_atomic_helper.h> |