summaryrefslogtreecommitdiff
path: root/src/atimode.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-01 15:06:43 +0000
committerEgbert Eich <eich@suse.de>2004-03-01 15:06:43 +0000
commit44f6e3a406839df747c942599c867aa66ccf43ab (patch)
tree4b4ac0ed48b0c0f4854fc7e090e015ea3d2bee13 /src/atimode.c
parent0779e46ecd01e3f0e413cedfff6df7b3b70618c2 (diff)
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich). 1. First add of SUN's XIVIE extension (Stuart Kreitman).
Diffstat (limited to 'src/atimode.c')
-rw-r--r--src/atimode.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/atimode.c b/src/atimode.c
index 02cf319..0aea9fa 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.17 2003/04/23 21:51:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.19 2004/02/11 17:20:06 tsi Exp $ */
/*
- * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -125,7 +125,6 @@ ATISwap
seq4 = GetReg(SEQX, 0x04U);
gra1 = GetReg(GRAX, 0x01U);
gra3 = GetReg(GRAX, 0x03U);
- gra4 = GetReg(GRAX, 0x04U);
gra5 = GetReg(GRAX, 0x05U);
gra6 = GetReg(GRAX, 0x06U);
gra8 = GetReg(GRAX, 0x08U);
@@ -365,7 +364,7 @@ ATIModeSave
int Index;
- /* Get bank to bank 0 */
+ /* Get back to bank 0 */
(*pATIHW->SetBank)(pATI, 0);
#endif /* AVOID_CPIO */