[Intel-xe] [PATCH 2/2] fixup! drm/i915/display: Remaining changes to make xe compile

[Jani Nikula]

Currently "drm/xe: Introduce a new DRM driver for Intel GPUs" removes
these lines, so don't add them in "drm/i915/display: Remaining changes
to make xe compile" to begin with!

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg_defs.h b/drivers/gpu/drm/i915/i915_reg_defs.h
index a7c4101370ad..eac5a4141bfa 100644
--- a/drivers/gpu/drm/i915/i915_reg_defs.h
+++ b/drivers/gpu/drm/i915/i915_reg_defs.h
@@ -218,13 +218,9 @@ typedef struct {
 
 #define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
 
-#ifdef I915
 typedef struct {
 	u32 reg;
 } i915_mcr_reg_t;
-#else
-#define i915_mcr_reg_t i915_reg_t
-#endif
 
 #define MCR_REG(offset)	((const i915_mcr_reg_t){ .reg = (offset) })
 
-- 
2.39.2