---

yaml --- r: 337805 b: refs/heads/master c: c705ea8 h: refs/heads/master i: 337803: c3a10ab v: v3
git-mirror · Nov 13, 2012 · 402c6fa · 402c6fa
1 parent 627c074
commit 402c6fa
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8e6c754e50fd05f8e44cd88fddb948d9c1e6740
+refs/heads/master: c705ea816585867d70903d9dbe3ecf64e368505a
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -24,7 +24,6 @@ static const unsigned short XGINew_VGA_DAC[] = {
 void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 {
 	pVBInfo->MCLKData = XGI340New_MCLKData;
-	pVBInfo->StResInfo = XGI330_StResInfo;
 
 	pVBInfo->LCDResInfo = 0;
 	pVBInfo->LCDTypeInfo = 0;

diff --git a/trunk/drivers/staging/xgifb/vb_struct.h b/trunk/drivers/staging/xgifb/vb_struct.h
@@ -178,8 +178,6 @@ struct vb_device_info {
 	struct XGI_TimingHStruct TimingH;
 	struct XGI_TimingVStruct TimingV;
 
-	struct SiS_StResInfo_S   *StResInfo;
-
 	int ram_type;
 	int ram_channel;
 	int ram_bus;

diff --git a/trunk/drivers/staging/xgifb/vb_table.h b/trunk/drivers/staging/xgifb/vb_table.h
@@ -2123,14 +2123,6 @@ static const unsigned char XGI330_ScreenOffset[] = {
 	0x57, 0x48
 };
 
-static struct SiS_StResInfo_S XGI330_StResInfo[] = {
-	{640, 400},
-	{640, 350},
-	{720, 400},
-	{720, 350},
-	{640, 480}
-};
-
 static const struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = {
 	{ 320,  200, 8,  8},
 	{ 320,  240, 8,  8},