VERSION -> CHIPS_VERSIONchips-1_1_0

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1fab582..0cae139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 	* src/ct_video.c:
 	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
 
+	* src/ct_driver.c:
+	VERSION -> CHIPS_VERSION
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/src/ct_driver.c b/src/ct_driver.c
index d31f9b9..f5dc1ba 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -462,7 +462,7 @@ static DisplayModeRec ChipsNTSCMode = {
 };
 #endif
 
-#define VERSION 4000
+#define CHIPS_VERSION 4000
 #define CHIPS_NAME "CHIPS"
 #define CHIPS_DRIVER_NAME "chips"
 #define CHIPS_MAJOR_VERSION 1
@@ -478,7 +478,7 @@ static DisplayModeRec ChipsNTSCMode = {
  */
 
 _X_EXPORT DriverRec CHIPS = {
-	VERSION,
+	CHIPS_VERSION,
 	CHIPS_DRIVER_NAME,
 	CHIPSIdentify,
 	CHIPSProbe,
@@ -887,7 +887,7 @@ CHIPSProbe(DriverPtr drv, int flags)
 		if ((pScrn = xf86ConfigPciEntity(pScrn,0,usedChips[i],
 						       CHIPSPCIchipsets,NULL,
 						       NULL,NULL,NULL,NULL))){
-		    pScrn->driverVersion = VERSION;
+		    pScrn->driverVersion = CHIPS_VERSION;
 		    pScrn->driverName    = CHIPS_DRIVER_NAME;
 		    pScrn->name          = CHIPS_NAME;
 		    pScrn->Probe         = CHIPSProbe;