summaryrefslogtreecommitdiff
path: root/src/ativga.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:59 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:59 +0000
commit2eab4a4e2b8f2ec2154738f0dd57cf0dc5c7816a (patch)
treeadd0e49232de50548191a4243ed0d32cc91d1ec5 /src/ativga.c
parent770358c0804c3e919440d2575e4ef25365f763b6 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/ativga.c')
-rw-r--r--src/ativga.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ativga.c b/src/ativga.c
index 9a732a37..62edf02f 100644
--- a/src/ativga.c
+++ b/src/ativga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v 1.19 2003/01/01 19:16:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v 1.20 2003/04/23 21:51:31 tsi Exp $ */
/*
* Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
@@ -318,7 +318,9 @@ ATIVGACalculate
pMode->CrtcVTotal >>= 1;
}
else
+ {
pATIHW->crt[23] &= ~0x04U;
+ }
pMode->CrtcVDisplay--;
if (pATI->Chip == ATI_CHIP_18800)