diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:27 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:27 +0200 |
| commit | 9c7f5cf088789957dcfb460cca1ab0fb578f2376 (patch) | |
| tree | 6f5f305e5021fe5babb17feaf67be99d0f33e2ba /drivers/gpu/drm/sun4i/sun8i_mixer.c | |
| parent | 592c718e422de34b4c56ee66d2f02d3726b244ab (diff) | |
| parent | 5727dcfd8486399c40e39d2c08fe36fedab29d99 (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun8i_mixer.c')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun8i_mixer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 648b38a73066..4e9bd9cb6b36 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -19,7 +19,6 @@ #include <drm/drm_fb_cma_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_cma_helper.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include "sun4i_drv.h" |