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-intel-gt-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
gem
/
i915_gem_phys.c
diff --git
a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 36f373dc493cb7fb3f660a42c739eeb64200c4cf..be72ad0634bae5b0674921fb9e2cf8809893e752 100644
(file)
--- a/
drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/
drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@
-8,7
+8,6
@@
#include <linux/shmem_fs.h>
#include <linux/swap.h>
-#include <drm/drm.h> /* for drm_legacy.h! */
#include <drm/drm_cache.h>
#include "gt/intel_gt.h"