diff options
author | Dave Airlie <airlied@redhat.com> | 2019-08-22 06:06:50 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-08-22 06:16:19 +0300 |
commit | c011b93c1a9ccd4806fd6b48c8786c21397a7825 (patch) | |
tree | f7d6a42a700b6f699879cc2dc479b180ba6fdb8e /drivers/gpu/drm/bridge | |
parent | 5f680625d9765a2f936707465659acac8e44f514 (diff) | |
parent | 0b936e6122738f4cf474d1f3ff636cba0edc8b94 (diff) | |
download | linux-c011b93c1a9ccd4806fd6b48c8786c21397a7825.tar.xz |
Merge tag 'du-next-20190816' of git://linuxtv.org/pinchartl/media into drm-next
- R-Car DU fixes
- Misc. DRM cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190816133500.GJ5020@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/bridge')
-rw-r--r-- | drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 4044071090c4..a4685d062591 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -27,7 +27,6 @@ #include <drm/bridge/dw_hdmi.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> -#include <drm/drm_encoder_slave.h> #include <drm/drm_of.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> |