diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-08-23 12:35:39 +0300 |
---|---|---|
committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-08-23 12:35:39 +0300 |
commit | 6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76 (patch) | |
tree | f826145c5bf9c502c033e7b67bcefc30eb0f9eee /drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | |
parent | 5b6cc1277a0536dae20f37d531f29b3416cee670 (diff) | |
parent | 15d90b242290f228166ea79ee1cc2db6b31a2143 (diff) | |
download | linux-6f50fa2a6f1395ad5f59ce7b87730f1f3ea19d76.tar.xz |
Merge branch 'master' into for-5.4/logitech
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c index ec78e2b2015c..571a6dfb473e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c @@ -23,7 +23,7 @@ * Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> + #include <drm/drm_crtc_helper.h> #include <drm/amdgpu_drm.h> #include "amdgpu.h" |