Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 20:45:28 +0000 (12:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 20:45:28 +0000 (12:45 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: remove BUG_ON() from sysfs_remove_group()
  Driver core: Revert "Fix Firmware class name collision"
  Block: Fix whole_disk attribute bug

drivers/char/drm/i915_drv.h

index 37bbf6729b4e699fa5ef66eeadfba3fa2aac07e3..f8308bfb26131ced8c68fa0d5fdf2a1220b1f993 100644 (file)
@@ -187,7 +187,7 @@ typedef struct drm_i915_private {
        u32 saveSWF2[3];
        u8 saveMSR;
        u8 saveSR[8];
-       u8 saveGR[24];
+       u8 saveGR[25];
        u8 saveAR_INDEX;
        u8 saveAR[20];
        u8 saveDACMASK;