Merge airlied/drm-next into drm-intel-next-queued

[mirror_ubuntu-hirsute-kernel.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0e84346115dde899ae7a3a05fc99e6ec7e050fdc..ef089fe0353ef75e83d5608b7940c1ac591569d8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2302,11 +2302,9 @@ struct drm_i915_private {
 
        struct drm_i915_gem_object *vlv_pctx;
 
-#ifdef CONFIG_DRM_FBDEV_EMULATION
        /* list of fbdev register on this device */
        struct intel_fbdev *fbdev;
        struct work_struct fbdev_suspend_work;
-#endif
 
        struct drm_property *broadcast_rgb_property;
        struct drm_property *force_audio_property;