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>

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index fdb7d1a78b3b614d250238cf7da80c161d2cfd6e..0f6a52954c0183dc24cfd4c865b59cdca7980f7c 100644 (file)
--- 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 76d3fe1cb57aa2119184e175ccc86d231415e9f4..0ed8036a77775778a2654997d590877c074905ac 100644 (file)
--- 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 32eecf6702579d93203a150d96d6ff746d076d4a..70158c2c68af4b0125bd9e87c0e57037ca744b1b 100644 (file)
--- 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;