diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-08-22 13:06:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-08-22 13:16:19 +1000 |
| commit | c011b93c1a9ccd4806fd6b48c8786c21397a7825 (patch) | |
| tree | f7d6a42a700b6f699879cc2dc479b180ba6fdb8e /drivers/gpu/drm/imx | |
| parent | Merge tag 'drm-misc-next-2019-08-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | drm: rcar-du: lvds: Fix bridge_to_rcar_lvds (diff) | |
| download | linux-dev-c011b93c1a9ccd4806fd6b48c8786c21397a7825.tar.xz linux-dev-c011b93c1a9ccd4806fd6b48c8786c21397a7825.zip | |
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/imx')
| -rw-r--r-- | drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c index 5a3ad6fc8ea7..f22cfbf9353e 100644 --- a/drivers/gpu/drm/imx/dw_hdmi-imx.c +++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c @@ -16,7 +16,7 @@ #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_encoder.h> #include <drm/drm_of.h> #include "imx-drm.h" |