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
/
amdgpu_drv.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 82b9f85f922b679be04ecd2012c8a0a22adf3fe3..e3fed38a0d901593e4b82681e0941d62a560c561 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@
-38,7
+38,6
@@
#include <linux/mmu_notifier.h>
#include <linux/suspend.h>
#include <linux/cc_platform.h>
-#include <linux/fb.h>
#include <linux/dynamic_debug.h>
#include "amdgpu.h"