diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-20 13:40:33 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-20 14:10:07 -0700 |
| commit | 86a3073e480c522f12e5291a462f68f6ee30aee3 (patch) | |
| tree | 5804f9d944084ff5245d07e8340779a4ecd52f9b /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 0ac225e56997ef89f46eb51b02799a685b78f214 (diff) | |
| parent | 32ce697c53f41290c3a2d3807b521b0fe4f42d2a (diff) | |
Merge branch 'edp-training-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Just whitespace change conflicts
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 15c0ca58ad8b..b2ac20287f3b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -349,7 +349,6 @@ typedef struct drm_i915_private { /* LVDS info */ int backlight_level; /* restore backlight to this value */ bool backlight_enabled; - struct drm_display_mode *panel_fixed_mode; struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */ struct drm_display_mode *sdvo_lvds_vbt_mode; /* if any */ @@ -674,7 +673,6 @@ typedef struct drm_i915_private { unsigned int lvds_border_bits; /* Panel fitter placement and size for Ironlake+ */ u32 pch_pf_pos, pch_pf_size; - int panel_t3, panel_t12; struct drm_crtc *plane_to_crtc_mapping[2]; struct drm_crtc *pipe_to_crtc_mapping[2]; |