diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-29 19:24:10 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-29 19:24:10 -0400 |
| commit | 9b546e571b94cacccf1091cc9cc0bd8a6a207a66 (patch) | |
| tree | fd50ef5eae6b8283e26926fa5d664f7e1cd88920 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 2c1756b12edc19fdd75c833699cb752e1bbb641e (diff) | |
| parent | cda2bb78c24de7674eafa3210314dc75bed344a6 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 6867e193d85e..feb4f164fd1b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -544,6 +544,7 @@ typedef struct drm_i915_private { | |||
| 544 | u32 savePIPEB_LINK_M1; | 544 | u32 savePIPEB_LINK_M1; |
| 545 | u32 savePIPEB_LINK_N1; | 545 | u32 savePIPEB_LINK_N1; |
| 546 | u32 saveMCHBAR_RENDER_STANDBY; | 546 | u32 saveMCHBAR_RENDER_STANDBY; |
| 547 | u32 savePCH_PORT_HOTPLUG; | ||
| 547 | 548 | ||
| 548 | struct { | 549 | struct { |
| 549 | /** Bridge to intel-gtt-ko */ | 550 | /** Bridge to intel-gtt-ko */ |