Module Name: xsrc
Committed By: mrg
Date: Thu Jun 17 04:50:43 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c
Log Message:
merge xf86-video-suncg14 1.1.1
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.3 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.4
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.3 Thu Jun 10 13:26:46 2010
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c Thu Jun 17 04:50:43 2010
@@ -20,7 +20,6 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c,v 1.6 2001/10/01 13:44:10 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -66,9 +65,9 @@
#define CG14_VERSION 4000
#define CG14_NAME "SUNCG14"
#define CG14_DRIVER_NAME "suncg14"
-#define CG14_MAJOR_VERSION 1
-#define CG14_MINOR_VERSION 1
-#define CG14_PATCHLEVEL 0
+#define CG14_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define CG14_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define CG14_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the driver
