From ee8032e692c8792e5ba866ff344b818bc9a06451 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 17 Jun 2010 13:10:53 -0400
Subject: [PATCH] --- yaml --- r: 205701 b: refs/heads/master c:
 a3e735a5a2fcf40819f26411e2605fde2064d6ca h: refs/heads/master i:   205699:
 128138ec6ef1cfd89aad5ec270a16eae87739333 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/xgifb/XGIfb.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 62de0a6391e1..8443918480a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 716083c63bf31649e08df25a4f4548689451330d
+refs/heads/master: a3e735a5a2fcf40819f26411e2605fde2064d6ca
diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h
index 46954d7de328..4c29cf043741 100644
--- a/trunk/drivers/staging/xgifb/XGIfb.h
+++ b/trunk/drivers/staging/xgifb/XGIfb.h
@@ -95,7 +95,7 @@ struct XGIfb_info {
 
 
 
-typedef enum _TVPLUGTYPE {	// vicki@030226
+enum xgi_tv_plug {	/* vicki@030226 */
 //	TVPLUG_Legacy = 0,
 //	TVPLUG_COMPOSITE,
 //	TVPLUG_SVIDEO,
@@ -111,7 +111,7 @@ typedef enum _TVPLUGTYPE {	// vicki@030226
     	TVPLUG_YPBPR_750P = 7,
     	TVPLUG_YPBPR_1080i = 8,
 	TVPLUG_TOTAL
-} XGI_TV_PLUG;
+};
 
 
 struct mode_info {
@@ -133,7 +133,7 @@ struct ap_data {
 	enum XGI_CHIP_TYPE chip;
 	unsigned char hasVB;
 	enum xgi_tvtype TV_type;
-	XGI_TV_PLUG TV_plug;
+	enum xgi_tv_plug TV_plug;
 	unsigned long version;
 	char reserved[256];
 };