Merge drm/drm-next into drm-intel-next

[linux-block.git] / drivers / gpu / drm / i915 / display / intel_display_types.h

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 9258d50a07a0593efff3f250d5f1ed976f08a9ce..8da87cbb172bddc7449b572753cdafebf3321bad 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -105,7 +105,7 @@ struct intel_fb_view {
         * In the normal view the FB object's backing store sg list is used
         * directly and hence the remap information here is not used.
         */
-       struct i915_ggtt_view gtt;
+       struct i915_gtt_view gtt;
 
        /*
         * The GTT view (gtt.type) specific information for each FB color