diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-09-29 17:11:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-09-29 17:11:04 +1000 |
| commit | 2b702e72e33bbdec0764cfb6e1dd00fe1142ae55 (patch) | |
| tree | 1412cffe9835b58a4880a49e86f2351b4607412b /drivers/gpu/drm/sun4i/sun4i_hdmi.h | |
| parent | 2726e15e54da3d50925bdaae932152a900a24f95 (diff) | |
| parent | a98c75fcd0ec02623f4f56d824d76e659410a52b (diff) | |
| download | op-kernel-dev-2b702e72e33bbdec0764cfb6e1dd00fe1142ae55.zip op-kernel-dev-2b702e72e33bbdec0764cfb6e1dd00fe1142ae55.tar.gz | |
Merge tag 'drm-misc-fixes-2017-09-28-1' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Driver Changes:
- qxl: fix primary surface and fb unpinning (Gerd)
- sun41: fix CEC_PIN config gate now that media has been merged (Hans)
- tegra: fix TRACE_INCLUDE_PATH (Thierry)
Cc: Thierry Reding <treding@nvidia.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Gerd Hoffmann <kraxel@redhat.com>
* tag 'drm-misc-fixes-2017-09-28-1' of git://anongit.freedesktop.org/git/drm-misc:
drm/tegra: trace: Fix path to include
qxl: fix framebuffer unpinning
drm/sun4i: cec: Enable back CEC-pin framework
qxl: fix primary surface handling
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun4i_hdmi.h')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_hdmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu/drm/sun4i/sun4i_hdmi.h index 1457750..a1f8cba 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h @@ -15,7 +15,7 @@ #include <drm/drm_connector.h> #include <drm/drm_encoder.h> -#include <media/cec.h> +#include <media/cec-pin.h> #define SUN4I_HDMI_CTRL_REG 0x004 #define SUN4I_HDMI_CTRL_ENABLE BIT(31) |
