diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-02 10:18:45 +0300 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-02 10:18:45 +0300 |
commit | 942baad211336efefb93a8369478888ab845c450 (patch) | |
tree | d959f4b4c0680e6b589cc9684bd489f09ee65fd8 /drivers/gpu/drm/i915/gem/i915_gem_phys.c | |
parent | 35cbd91eb541e001f6e2648c56abb5361e3d6774 (diff) | |
parent | ccd1950c2f7e38ae45aeefb99a08b39407cd6c63 (diff) |
Merge drm/drm-next into drm-intel-gt-next
Pulling in -rc2 fixes and TTM changes that next upcoming patches depend
on.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_phys.c')
-rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c index 36f373dc493c..be72ad0634ba 100644 --- 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" |