From c2052b8ea9b47532d1f855beb35ce4cee4cd2c17 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 4 Nov 2012 21:14:55 +0200
Subject: [PATCH] --- yaml --- r: 337799 b: refs/heads/master c:
 7c5c07a611069a97aafc316d701da7bd08de14ee h: refs/heads/master i:   337797:
 c50ddc0380f63e51f58aedcc113727985448e709   337795:
 322117114f72a2aede528f4d65a22c7938a16105   337791:
 1b7bc676307fc04db5394863303da9c6194f21b0 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/xgifb/vb_setmode.c | 10 ++++------
 trunk/drivers/staging/xgifb/vb_struct.h  |  1 -
 trunk/drivers/staging/xgifb/vb_table.h   |  2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 94be250e027f..07fc869d44a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7853bced96ff8026a779f7acfad9fcadcd080f66
+refs/heads/master: 7c5c07a611069a97aafc316d701da7bd08de14ee
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index 7ee42ac8e3ab..59423addd2c6 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -49,8 +49,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 	pVBInfo->SR21 = 0xa3;
 	pVBInfo->SR22 = 0xfb;
 
-	pVBInfo->UpdateCRT1 = XGI_UpdateCRT1Table;
-
 	/* 310 customization related */
 	if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))
 		pVBInfo->LCDCapList = XGI_LCDDLCapList;
@@ -729,13 +727,13 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
 
 	if (index != -1) {
 		xgifb_reg_set(pVBInfo->P3d4, 0x02,
-				pVBInfo->UpdateCRT1[index].CR02);
+				XGI_UpdateCRT1Table[index].CR02);
 		xgifb_reg_set(pVBInfo->P3d4, 0x03,
-				pVBInfo->UpdateCRT1[index].CR03);
+				XGI_UpdateCRT1Table[index].CR03);
 		xgifb_reg_set(pVBInfo->P3d4, 0x15,
-				pVBInfo->UpdateCRT1[index].CR15);
+				XGI_UpdateCRT1Table[index].CR15);
 		xgifb_reg_set(pVBInfo->P3d4, 0x16,
-				pVBInfo->UpdateCRT1[index].CR16);
+				XGI_UpdateCRT1Table[index].CR16);
 	}
 }
 
diff --git a/trunk/drivers/staging/xgifb/vb_struct.h b/trunk/drivers/staging/xgifb/vb_struct.h
index 8bfbfab04643..e73ccd57e240 100644
--- a/trunk/drivers/staging/xgifb/vb_struct.h
+++ b/trunk/drivers/staging/xgifb/vb_struct.h
@@ -187,7 +187,6 @@ struct vb_device_info {
 	struct SiS_VBVCLKData  *VBVCLKData;
 	struct SiS_StResInfo_S   *StResInfo;
 	struct SiS_ModeResInfo_S *ModeResInfo;
-	struct XGI_XG21CRT1Struct	  *UpdateCRT1;
 
 	int ram_type;
 	int ram_channel;
diff --git a/trunk/drivers/staging/xgifb/vb_table.h b/trunk/drivers/staging/xgifb/vb_table.h
index e83c4259ce28..c08c04eaad0e 100644
--- a/trunk/drivers/staging/xgifb/vb_table.h
+++ b/trunk/drivers/staging/xgifb/vb_table.h
@@ -216,7 +216,7 @@ static const struct SiS_StandTable_S XGI330_StandTable = {
 	 0xff}
 };
 
-static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {
+static const struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {
 	{0x01, 0x27, 0x91, 0x8f, 0xc0},	/* 00 */
 	{0x03, 0x4f, 0x83, 0x8f, 0xc0},	/* 01 */
 	{0x05, 0x27, 0x91, 0x8f, 0xc0},	/* 02 */