diff options
author | Aaro Koskinen | 2012-09-10 23:15:30 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-09-11 00:48:17 +0200 |
commit | 8951dadc97aa51376611670d024f7418463a7bbd (patch) | |
tree | 7bff0725e1c3bf23b1c7be7efc6b01e09279571e /drivers/staging/xgifb | |
parent | staging: xgifb: mark constant data with const (diff) | |
download | kernel-qcow2-linux-8951dadc97aa51376611670d024f7418463a7bbd.tar.gz kernel-qcow2-linux-8951dadc97aa51376611670d024f7418463a7bbd.tar.xz kernel-qcow2-linux-8951dadc97aa51376611670d024f7418463a7bbd.zip |
staging: xgifb: delete ISXPDOS
Delete unneeded flag.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r-- | drivers/staging/xgifb/vb_init.c | 2 | ||||
-rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 4 | ||||
-rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index fdb7d1a78b3b..0f6a52954c01 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -1299,8 +1299,6 @@ unsigned char XGIInitNew(struct pci_dev *pdev) outb(0x67, (pVBInfo->BaseAddr + 0x12)); /* 3c2 <- 67 ,ynlai */ - pVBInfo->ISXPDOS = 0; - pVBInfo->P3c4 = pVBInfo->BaseAddr + 0x14; pVBInfo->P3d4 = pVBInfo->BaseAddr + 0x24; pVBInfo->P3c0 = pVBInfo->BaseAddr + 0x10; diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 76d3fe1cb57a..0ed8036a7777 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -4872,9 +4872,7 @@ static void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, } /* end 301b */ - if (pVBInfo->ISXPDOS == 0) - XGI_SetCRT2VCLK(ModeNo, ModeIdIndex, RefreshRateTableIndex, - pVBInfo); + XGI_SetCRT2VCLK(ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); } static void XGINew_EnableCRT2(struct vb_device_info *pVBInfo) diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 32eecf670257..70158c2c68af 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -135,7 +135,6 @@ struct XGI301C_Tap4TimingStruct { }; struct vb_device_info { - unsigned char ISXPDOS; unsigned long P3c4, P3d4, P3c0, P3ce, P3c2, P3cc; unsigned long P3ca, P3c6, P3c7, P3c8, P3c9, P3da; unsigned long Part0Port, Part1Port, Part2Port; |