From cf35c702e60267eeaceefb84cad49295733aea11 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 31 Aug 2011 21:45:59 +0300 Subject: [PATCH] --- yaml --- r: 268105 b: refs/heads/master c: 160b006ae90c821de3aace654159aa75da6d9c3d h: refs/heads/master i: 268103: d8c4a11c9fd5da86bdd5332eda3804a8df4e4c62 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/vb_setmode.c | 5 ----- trunk/drivers/staging/xgifb/vb_struct.h | 4 ---- trunk/drivers/staging/xgifb/vb_table.h | 8 -------- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 94716ba4427c..5e8c7df7fe73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83f76a9d7e055beb90e14f5986c06e24f60a131e +refs/heads/master: 160b006ae90c821de3aace654159aa75da6d9c3d diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c index b4b5ea26c6a9..910d8d9afc4c 100644 --- a/trunk/drivers/staging/xgifb/vb_setmode.c +++ b/trunk/drivers/staging/xgifb/vb_setmode.c @@ -141,11 +141,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->TimingV = (struct XGI_TimingVStruct *) XGI_TimingV; pVBInfo->UpdateCRT1 = (struct XGI_XG21CRT1Struct *) XGI_UpdateCRT1Table; - pVBInfo->CHTVVCLKUNTSC = XGI330_CHTVVCLKUNTSC; - pVBInfo->CHTVVCLKONTSC = XGI330_CHTVVCLKONTSC; - pVBInfo->CHTVVCLKUPAL = XGI330_CHTVVCLKUPAL; - pVBInfo->CHTVVCLKOPAL = XGI330_CHTVVCLKOPAL; - /* 310 customization related */ if ((pVBInfo->VBType & VB_XGI301LV) || (pVBInfo->VBType & VB_XGI302LV)) pVBInfo->LCDCapList = XGI_LCDDLCapList; diff --git a/trunk/drivers/staging/xgifb/vb_struct.h b/trunk/drivers/staging/xgifb/vb_struct.h index ee4f5b376b5d..3cb2e7e1b3b2 100644 --- a/trunk/drivers/staging/xgifb/vb_struct.h +++ b/trunk/drivers/staging/xgifb/vb_struct.h @@ -357,10 +357,6 @@ struct vb_device_info { unsigned char *XGI_TVDelayList; unsigned char *XGI_TVDelayList2; - unsigned char *CHTVVCLKUNTSC; - unsigned char *CHTVVCLKONTSC; - unsigned char *CHTVVCLKUPAL; - unsigned char *CHTVVCLKOPAL; unsigned char *NTSCTiming; unsigned char *PALTiming; unsigned char *HiTVExtTiming; diff --git a/trunk/drivers/staging/xgifb/vb_table.h b/trunk/drivers/staging/xgifb/vb_table.h index c97b85c573e2..e5e19ec950ef 100644 --- a/trunk/drivers/staging/xgifb/vb_table.h +++ b/trunk/drivers/staging/xgifb/vb_table.h @@ -2992,14 +2992,6 @@ static unsigned char XG27_CRDE[] = {0, 0}; static unsigned char XG27_SR40 = 0x04 ; static unsigned char XG27_SR41 = 0x00 ; -static unsigned char XGI330_CHTVVCLKUNTSC[] = {0x00}; - -static unsigned char XGI330_CHTVVCLKONTSC[] = {0x00}; - -static unsigned char XGI330_CHTVVCLKUPAL[] = {0x00}; - -static unsigned char XGI330_CHTVVCLKOPAL[] = {0x00}; - static struct XGI330_VCLKDataStruct XGI_VCLKData[] = { /* SR2B,SR2C,SR2D */ {0x1B, 0xE1, 25}, /* 00 (25.175MHz) */