From b2184024361717358e35a56b084c4a71cbc29234 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 12 Jun 2010 16:20:00 -0700
Subject: [PATCH] Delete unused devPrivate field from GCFuncs and GCOps.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
---
 hw/xfree86/common/xf86VGAarbiter.c | 1 -
 hw/xfree86/shadowfb/shadow.c       | 1 -
 hw/xfree86/xaa/xaaFallback.c       | 1 -
 hw/xfree86/xaa/xaaGC.c             | 1 -
 include/gcstruct.h                 | 3 ---
 miext/damage/damage.c              | 1 -
 6 files changed, 8 deletions(-)

diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 4f46059c3..becf4a9c7 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -53,7 +53,6 @@ static GCOps VGAarbiterGCOps = {
     VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,
     VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,
     VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,
-    {NULL}      /* devPrivate */
 };
 
 static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 344f1abf7..0af53d1b7 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -1730,6 +1730,5 @@ GCOps ShadowGCOps = {
     ShadowPolyText16, ShadowImageText8, 
     ShadowImageText16, ShadowImageGlyphBlt, 
     ShadowPolyGlyphBlt, ShadowPushPixels,
-    {NULL}		/* devPrivate */
 };
 
diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index 7ab4031f8..deeadbfb5 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -343,7 +343,6 @@ GCOps XAAFallbackOps = {
     XAAPolyText16Fallback, XAAImageText8Fallback, 
     XAAImageText16Fallback, XAAImageGlyphBltFallback, 
     XAAPolyGlyphBltFallback, XAAPushPixelsFallback,
-    {NULL}		/* devPrivate */
 };
 
 GCOps *XAAGetFallbackOps(void)
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index fbef88d77..fb243874e 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -651,5 +651,4 @@ GCOps XAAPixmapOps = {
     XAAPolyText16Pixmap, XAAImageText8Pixmap, 
     XAAImageText16Pixmap, XAAImageGlyphBltPixmap, 
     XAAPolyGlyphBltPixmap, XAAPushPixelsPixmap,
-    {NULL}		/* devPrivate */
 };
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 3f70eada4..b6d71a9a3 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -95,7 +95,6 @@ typedef struct _GCFuncs {
     void	(* CopyClip)(
 		GCPtr /*pgcDst*/,
 		GCPtr /*pgcSrc*/);
-    DevUnion	devPrivate;
 } GCFuncs;
 
 /*
@@ -264,8 +263,6 @@ typedef struct _GCOps {
 		int /*h*/,
 		int /*x*/,
 		int /*y*/);
-
-    DevUnion	devPrivate;
 } GCOps;
 
 /* there is padding in the bit fields because the Sun compiler doesn't
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index b809cca55..2b7e5f229 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -1757,7 +1757,6 @@ static GCOps damageGCOps = {
     damagePolyText16, damageImageText8,
     damageImageText16, damageImageGlyphBlt,
     damagePolyGlyphBlt, damagePushPixels,
-    {NULL}		/* devPrivate */
 };
 
 static void