From e3ba49f2e81a50dea4e304f3917388401d5b587e Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 11 Oct 2011 21:47:25 +0300
Subject: [PATCH] --- yaml --- r: 268799 b: refs/heads/master c:
 39f10bf18c80c98d9fec376beabe80b9c59c7498 h: refs/heads/master i:   268797:
 a9aae9c58e130838c427327eaf0c49fdcb3be75c   268795:
 9c413776531ce5de279967bf31c312699c7f5c40   268791:
 d5a71bd01dc90dc2f16a4d6f14b4e1f9c714a4a5   268783:
 f1c610ffceea32c9dc34c47788ffba1937067778   268767:
 78f0e700a98fc55233578ee2c7454a8f8d671af8   268735:
 48307b499d2556f0dc20aa75b58841309f935316   268671:
 3f1ae0d83c482de13fa8fab25deae9b3ef9cdd75   268543:
 2a4319eee174bafde04f75dae17b66185a53f52c   268287:
 f967bdadb31a49a7d9775f0d2e4fd79256ecf9a5 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/xgifb/XGI_main.h    |  3 ---
 trunk/drivers/staging/xgifb/XGI_main_26.c | 11 ++++-------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d162b39a1d0d..ef93403d45bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791
+refs/heads/master: 39f10bf18c80c98d9fec376beabe80b9c59c7498
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index e584f0b65439..7e5d029512dc 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -171,9 +171,6 @@ static int XGIfb_tvmode;
 static int enable_dstn;
 static int XGIfb_ypan = -1;
 
-
-static int XGIfb_CRT2_write_enable;
-
 /* TW: CRT2 type (for overriding autodetection) */
 static int XGIfb_crt2type = -1;
 /* PR: Tv plug type (for overriding autodetection) */
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 45427d720274..8c9c187e7e39 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -967,7 +967,9 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
 				filter = -1;
 				break;
 			}
-			xgifb_reg_or(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
+			xgifb_reg_or(XGIPART1,
+				     IND_XGI_CRT2_WRITE_ENABLE_315,
+				     0x01);
 
 			if (xgifb_info->TV_type == TVMODE_NTSC) {
 
@@ -1335,7 +1337,7 @@ static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info,
 	xgifb_reg_and_or(XGISR, 0x37, 0xDF, (base >> 21) & 0x04);
 
 	if (xgifb_info->disp_state & DISPTYPE_DISP2) {
-		xgifb_reg_or(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
+		xgifb_reg_or(XGIPART1, IND_XGI_CRT2_WRITE_ENABLE_315, 0x01);
 		xgifb_reg_set(XGIPART1, 0x06, (base & 0xFF));
 		xgifb_reg_set(XGIPART1, 0x05, ((base >> 8) & 0xFF));
 		xgifb_reg_set(XGIPART1, 0x04, ((base >> 16) & 0xFF));
@@ -2023,23 +2025,18 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 			xgifb_info->chip = XG21;
 		else
 			xgifb_info->chip = XG20;
-		XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
 		break;
 	case PCI_DEVICE_ID_XG_40:
 		xgifb_info->chip = XG40;
-		XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
 		break;
 	case PCI_DEVICE_ID_XG_41:
 		xgifb_info->chip = XG41;
-		XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
 		break;
 	case PCI_DEVICE_ID_XG_42:
 		xgifb_info->chip = XG42;
-		XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
 		break;
 	case PCI_DEVICE_ID_XG_27:
 		xgifb_info->chip = XG27;
-		XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
 		break;
 	default:
 		ret = -ENODEV;