summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Ripard <mripard@kernel.org>2019-10-03 10:00:13 +0200
committerMaxime Ripard <mripard@kernel.org>2019-10-03 10:00:13 +0200
commitb6559bf3ac32acfe34e17c73d68581e7f7415785 (patch)
treeabd998cfc150195cb9e80d314175ffc86f7ac761
parent77fdaa091d79c87323a9f3912a25f73e02ea2a01 (diff)
parentd7d44b6fe40a98e960be92ea8617954c2596d140 (diff)
Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixesdrm-misc-fixes-2019-10-03
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.c1
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>
ap for a wrong addressDejin Zheng1-0/+2 2019-12-05video: constify fb ops across all driversJani Nikula1-1/+1 2019-08-19video: fbdev: sm712fb: Use dev_get_drvdataChuhong Yuan1-6/+2 2019-06-28video: fbdev: don't print error message on framebuffer_alloc() failureBartlomiej Zolnierkiewicz1-1/+0 2019-04-02fbdev: sm712fb: fix memory frequency by avoiding a switch/case fallthroughYifeng Li1-0/+1 2019-04-01fbdev: sm712fb: use 1024x768 by default on non-MIPS, fix garbled displayYifeng Li1-13/+40 2019-04-01fbdev: sm712fb: fix support for 1024x768-16 modeYifeng Li1-0/+59 2019-04-01fbdev: sm712fb: fix crashes and garbled display during DPMS modesettingYifeng Li1-26/+38 2019-04-01fbdev: sm712fb: fix crashes during framebuffer writes by correctly mapping VRAMYifeng Li1-4/+44 2019-04-01fbdev: sm712fb: fix boot screen glitch when sm712fb replaces VGAYifeng Li1-1/+5 2019-04-01fbdev: sm712fb: fix VRAM detection, don't set SR70/71/74/75Yifeng Li1-1/+3 2019-04-01fbdev: sm712fb: fix brightness control on reboot, don't set SR30Yifeng Li1-2/+2 2019-04-01fbdev: sm712fb: fix white screen of death on reboot, don't set CR3B-CR3FYifeng Li1-1/+5 2017-08-01video: fbdev: sm712fb.c: fixed constant-left comparison warningLynn Lei1-1/+1 2017-08-01video: fbdev: sm712fb.c: fixed prefer unsigned int warningLynn Lei1-4/+5 2017-08-01video: fbdev: sm712fb.c: fix unaligned block comments warningLynn Lei1-2/+2 2017-08-01video: fbdev: sm712fb.c: using __func__ macro for pr_debugLynn Lei1-1/+1 2016-09-27video: fbdev: constify fb_fix_screeninfo and fb_var_screeninfo structuresJulia Lawall1-1/+1 2015-12-15fbdev: sm712fb: avoid unused function warningsArnd Bergmann1-13/+3 2015-08-07staging: sm7xxfb: merge sm712fb with fbdevSudip Mukherjee1-0/+1653