From 0705e8e1e4a92bc44aef6c289185c3fff1666b02 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Wed, 24 Aug 2011 18:21:50 +0300
Subject: [PATCH] --- yaml --- r: 267718 b: refs/heads/master c:
 883dac41534b3a16e490be36fb995f17e93bf210 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/xgifb/XGI_main.h    |  8 --------
 trunk/drivers/staging/xgifb/XGI_main_26.c | 10 ----------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 3ad743971e68..8123a259fdcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f686e9affba24cfdf94fb155aaeb36a1e14719f1
+refs/heads/master: 883dac41534b3a16e490be36fb995f17e93bf210
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index 39893ca78143..a0c2bdb4f86d 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -179,7 +179,6 @@ static int XGIfb_userom ;
 /*static int XGIfb_useoem = -1; */
 
 /* global flags */
-static int XGIfb_registered;
 static int XGIfb_tvmode;
 static int XGIfb_pdc;
 static int enable_dstn;
@@ -193,13 +192,6 @@ static int XGIfb_crt2type = -1;
 /* PR: Tv plug type (for overriding autodetection) */
 static int XGIfb_tvplug = -1;
 
-static unsigned char XGIfb_detectedpdc;
-
-static unsigned char XGIfb_detectedlcda = 0xff;
-
-
-
-
 /* TW: For ioctl XGIFB_GET_INFO */
 /* XGIfb_info XGIfbinfo; */
 
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 4415d4aedbec..847d246ef6fa 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -2046,8 +2046,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 	if (XGIfb_off)
 		return -ENXIO;
 
-	XGIfb_registered = 0;
-
 	memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
 	fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
 	if (!fb_info)
@@ -2307,12 +2305,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 		}
 	}
 
-	XGIfb_detectedpdc = 0;
-
-	XGIfb_detectedlcda = 0xff;
-
-	/* TW: Try to find about LCDA */
-
 	if ((XGIhw_ext.ujVBChipID == VB_CHIP_302B) ||
 			(XGIhw_ext.ujVBChipID == VB_CHIP_301LV) ||
 			(XGIhw_ext.ujVBChipID == VB_CHIP_302LV)) {
@@ -2476,8 +2468,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 		goto error_1;
 	}
 
-	XGIfb_registered = 1;
-
 	printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%02d\n",
 	       fb_info->node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);