diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /drivers/video/sis/init301.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/video/sis/init301.h')
| -rw-r--r-- | drivers/video/sis/init301.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h index f05aebc994b..f84eb54164a 100644 --- a/drivers/video/sis/init301.h +++ b/drivers/video/sis/init301.h @@ -293,7 +293,6 @@ static UCHAR SiS300_TrumpionData[7][80] = { #endif void SiS_UnLockCRT2(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); -void SiS_LockCRT2(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); void SiS_EnableCRT2(SiS_Private *SiS_Pr); USHORT SiS_GetRatePtr(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex, PSIS_HW_INFO HwInfo); void SiS_WaitRetrace1(SiS_Private *SiS_Pr); @@ -310,7 +309,6 @@ USHORT SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex, USHORT RefreshRateTableIndex, PSIS_HW_INFO HwInfo); USHORT SiS_GetResInfo(SiS_Private *SiS_Pr,USHORT ModeNo,USHORT ModeIdIndex); void SiS_DisableBridge(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); -void SiS_EnableBridge(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); BOOLEAN SiS_SetCRT2Group(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo, USHORT ModeNo); void SiS_SiS30xBLOn(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); void SiS_SiS30xBLOff(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); @@ -319,8 +317,6 @@ void SiS_SetCH700x(SiS_Private *SiS_Pr, USHORT tempax); USHORT SiS_GetCH700x(SiS_Private *SiS_Pr, USHORT tempax); void SiS_SetCH701x(SiS_Private *SiS_Pr, USHORT tempax); USHORT SiS_GetCH701x(SiS_Private *SiS_Pr, USHORT tempax); -void SiS_SetCH70xx(SiS_Private *SiS_Pr, USHORT tempax); -USHORT SiS_GetCH70xx(SiS_Private *SiS_Pr, USHORT tempax); void SiS_SetCH70xxANDOR(SiS_Private *SiS_Pr, USHORT tempax,USHORT tempbh); #ifdef SIS315H static void SiS_Chrontel701xOn(SiS_Private *SiS_Pr, PSIS_HW_INFO HwInfo); |