diff options
| author | Maxime Ripard <mripard@kernel.org> | 2019-10-02 21:48:02 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2019-10-02 21:48:02 +0200 |
| commit | 6347ee48ab4b344ca5005e48c0e82189ef9a9614 (patch) | |
| tree | 6e89de5d06f26860905136286cc7cc9c5eaa16d4 | |
| parent | 2fbe7f3bca0001ebf36aed636ba0b8357143120f (diff) | |
| parent | d7d44b6fe40a98e960be92ea8617954c2596d140 (diff) | |
Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixesdrm-misc-fixes-2019-10-02
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> |