diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-31 21:46:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:42:13 -0700 |
| commit | 0c23b6d2fe9303070e81eee07070ecb549b3996e (patch) | |
| tree | f8fc7634ee96169b4f41c610d56acad63161fc6e /drivers/staging | |
| parent | cc5c2aeb231bcb67697ef3f2c3ed8947229b1384 (diff) | |
staging: xgifb: delete duplicated TV data tables
Delete redundant TV data tables. Replace as follows:
XGI_EPLCHTVDataPtr ==> xgifb_chrontel_tv
XGI_EPLCHTVRegPtr ==> xgifb_chrontel_tv
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 6 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_table.h | 21 |
2 files changed, 8 insertions, 19 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 1d209292c5f..db8944aa210 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -2325,7 +2325,8 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, tempdi = NULL; /*EPLCHTVCRT1Ptr_V;*/ break; case 2: - tempdi = XGI_EPLCHTVDataPtr; + case 6: + tempdi = xgifb_chrontel_tv; break; case 3: tempdi = NULL; @@ -2336,9 +2337,6 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, case 5: tempdi = NULL; break; - case 6: - tempdi = XGI_EPLCHTVRegPtr; - break; default: break; } diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index 1355c0b3bbd..cb58b2ea735 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -2476,21 +2476,12 @@ static struct XGI330_TVDataTablStruct XGI_TVDataTable[] = { {0xffff, 0x0000, 12} /* END */ }; -/* ;;Chrontel 7017 TV Timing List */ -static struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = { - {0x0011, 0x0000, 0}, /* XGI_CHTVUNTSCData */ - {0x0011, 0x0010, 1}, /* XGI_CHTVONTSCData */ - {0x0011, 0x0001, 2}, /* XGI_CHTVUPALData */ - {0x0011, 0x0011, 3}, /* XGI_CHTVOPALData */ - {0xFFFF, 0x0000, 4} -}; - -/* ;;Chrontel 7017 TV Reg. List */ -static struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = { - {0x0011, 0x0000, 0}, /* XGI_CHTVRegUNTSC */ - {0x0011, 0x0010, 1}, /* XGI_CHTVRegONTSC */ - {0x0011, 0x0001, 2}, /* XGI_CHTVRegUPAL */ - {0x0011, 0x0011, 3}, /* XGI_CHTVRegOPAL */ +/* Chrontel 7017 TV List */ +static struct XGI330_TVDataTablStruct xgifb_chrontel_tv[] = { + {0x0011, 0x0000, 0}, /* UNTSC */ + {0x0011, 0x0010, 1}, /* ONTSC */ + {0x0011, 0x0001, 2}, /* UPAL */ + {0x0011, 0x0011, 3}, /* OPAL */ {0xFFFF, 0x0000, 4} }; |