diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-31 21:46:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:42:13 -0700 |
| commit | d2de85c5da570977bb301c775b60b4a4a85d2338 (patch) | |
| tree | 875ed5e4b7352b60b047165cc42d92277774d31f /drivers/staging | |
| parent | 11fbdcde54db80130b8e9e37a9c8dd8f01dd2193 (diff) | |
| download | op-kernel-dev-d2de85c5da570977bb301c775b60b4a4a85d2338.zip op-kernel-dev-d2de85c5da570977bb301c775b60b4a4a85d2338.tar.gz | |
staging: xgifb: delete IF_DEF_VideoCapture
Delete already disabled code paths.
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_def.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 29 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 2 |
3 files changed, 1 insertions, 31 deletions
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index fab4414..00cdcb9 100644 --- a/drivers/staging/xgifb/vb_def.h +++ b/drivers/staging/xgifb/vb_def.h @@ -148,7 +148,6 @@ #define SetCRT2ToDualEdge 0x8000 #define ProgrammingCRT2 0x0001 /* Set Flag */ -#define EnableVCMode 0x0002 #define ReserveTVOption 0x0008 #define Win9xDOSMode 0x0020 #define GatingCRT 0x0800 diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 100f63f..dc344f2 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -3379,34 +3379,6 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, tempbx |= (SetInSlaveMode | SetSimuScanMode); } - - if (pVBInfo->IF_DEF_VideoCapture == 1) { - if (((HwDeviceExtension->jChipType == - XG40) && - (pVBInfo->Set_VGAType == XG40)) || - ((HwDeviceExtension->jChipType == - XG41) && - (pVBInfo->Set_VGAType == XG41)) || - ((HwDeviceExtension->jChipType == - XG42) && - (pVBInfo->Set_VGAType == XG42)) || - ((HwDeviceExtension->jChipType == - XG45) && - (pVBInfo->Set_VGAType == XG45))) { - if (ModeNo <= 13) { - if (!(tempbx & - SetCRT2ToRAMDAC)) { - /*CRT2 not need - * to support*/ - tempbx &= - (0x00FF | - (~SetInSlaveMode)); - pVBInfo->SetFlag - |= EnableVCMode; - } - } - } - } } /* LCD+TV can't support in slave mode @@ -7878,7 +7850,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress; pVBInfo->IF_DEF_LVDS = 0; pVBInfo->IF_DEF_LCDA = 1; - pVBInfo->IF_DEF_VideoCapture = 0; pVBInfo->IF_DEF_ScaleLCD = 0; pVBInfo->IF_DEF_OEMUtil = 0; pVBInfo->IF_DEF_PWD = 0; diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 3cb2e7e..2572e5c 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -288,7 +288,7 @@ struct vb_device_info { unsigned short ModeType; /* ,IF_DEF_FSTN; add for dstn */ unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN; - unsigned short IF_DEF_CRT2Monitor, IF_DEF_VideoCapture; + unsigned short IF_DEF_CRT2Monitor; unsigned short IF_DEF_LCDA, IF_DEF_YPbPr, IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD; unsigned short IF_DEF_ExpLink; |
