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
/
amdgpu
/
dce_v10_0.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index e85e57933cc45f4d1d22041de559b9122f8ada21..9a24ed463abdf431c96ef3eae97216f716471d0a 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@
-21,8
+21,9
@@
*
*/
-#include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
+#include <drm/drm_modeset_helper.h>
+#include <drm/drm_modeset_helper_vtables.h>
#include <drm/drm_vblank.h>
#include "amdgpu.h"