summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:35 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:35 +0000
commit49d4123b54777f0357c0f74f4652f35f62279823 (patch)
tree1602ded729c7a73753e29028b58c444a7c95b31b
parentfdddf201078615cbee160d42ce808a03f5bff89b (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--src/s3_accel.c2
-rw-r--r--src/s3_driver.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/s3_accel.c b/src/s3_accel.c
index 3641eaa..cd77330 100644
--- a/src/s3_accel.c
+++ b/src/s3_accel.c
@@ -24,7 +24,7 @@
*
*
*/
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.3 2003/11/23 18:07:31 twini Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */
diff --git a/src/s3_driver.c b/src/s3_driver.c
index e6799ea..e8f0f3e 100644
--- a/src/s3_driver.c
+++ b/src/s3_driver.c
@@ -258,7 +258,7 @@ static XF86ModuleVersionInfo S3VersRec = {
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,