diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
| commit | ef204fb5c24f9bd09192a9abebad6a06dd0b88db (patch) | |
| tree | a72ee9071462457b27475c2cc86e3c6256388ea9 /shared-core/i915_drv.h | |
| parent | 7f269bec7ed49385de394fdbd970f463ef2060f0 (diff) | |
| parent | b44f2da380e78769b58c751e81f376f0fa1f48aa (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index bfb09c49..a7040f5b 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -255,10 +255,10 @@ struct drm_i915_private { u8 saveSR[8]; u8 saveGR[25]; u8 saveAR_INDEX; - u8 saveAR[20]; + u8 saveAR[21]; u8 saveDACMASK; u8 saveDACDATA[256*3]; /* 256 3-byte colors */ - u8 saveCR[36]; + u8 saveCR[37]; }; enum intel_chip_family { |