git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
display
/
amdgpu_dm
/
amdgpu_dm.c
diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 6f99f6754c119efddf9cc97e2db21f57bd9ad8bb..0cb934641cc8a9b491ea2db35897bdb7ced38263 100644
(file)
--- a/
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@
-87,6
+87,7
@@
#include <drm/drm_blend.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_edid.h>
+#include <drm/drm_eld.h>
#include <drm/drm_vblank.h>
#include <drm/drm_audio_component.h>
#include <drm/drm_gem_atomic_helper.h>