summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 18:58:45 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 18:58:45 +0000
commit933fac699a3ba9257c87fb209b6dd21c29d15a4a (patch)
treebae4ae363e1498331ebe57582b5e8fb6cc892617
parenta878ca340afd5c94519ced8db60bac873e69d313 (diff)
VERSION -> CYRIX_VERSIONcyrix-1_1_0XORG-7_1
-rw-r--r--ChangeLog3
-rw-r--r--src/cyrix_driver.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 69a3ced..344113a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
* src/cyrix_shadow.c:
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ * src/cyrix_driver.c:
+ VERSION -> CYRIX_VERSION
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index d98108c..e44a5d1 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -410,7 +410,7 @@ CYRIXProbe(DriverPtr drv, int flags)
if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
CYRIXPCIchipsets,NULL, NULL,
NULL, NULL, NULL))) {
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = CYRIX_VERSION;
pScrn->driverName = CYRIX_DRIVER_NAME;
pScrn->name = CYRIX_NAME;
pScrn->Probe = CYRIXProbe;