[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/cirrus alp_driver.c, 1.1.4.2, 1.1.4.3 cir_driver.c, 1.1.4.2, 1.1.4.3 cirrus.man, 1.1.4.1, 1.1.4.2 lg_driver.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cirrus
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/cirrus

Modified Files:
      Tag: XORG-CURRENT
	alp_driver.c cir_driver.c cirrus.man lg_driver.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: alp_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/alp_driver.c	5 Mar 2004 13:40:22 -0000	1.1.4.2
+++ b/alp_driver.c	15 Apr 2004 10:16:19 -0000	1.1.4.3
@@ -238,7 +238,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	ALP_MAJOR_VERSION, ALP_MINOR_VERSION, ALP_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,

Index: cir_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/cir_driver.c	5 Mar 2004 13:40:22 -0000	1.1.4.2
+++ b/cir_driver.c	15 Apr 2004 10:16:20 -0000	1.1.4.3
@@ -143,7 +143,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	CIR_MAJOR_VERSION, CIR_MINOR_VERSION, CIR_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,

Index: cirrus.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/cirrus.man	5 Mar 2004 13:40:22 -0000	1.1.4.1
+++ b/cirrus.man	15 Apr 2004 10:16:20 -0000	1.1.4.2
@@ -14,17 +14,17 @@
 .fi
 .SH DESCRIPTION
 .B cirrus 
-is an XFree86 driver for Cirrus Logic video chips.
+is an __xservername__ driver for Cirrus Logic video chips.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B cirrus
 driver supports...
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: ...

Index: lg_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/lg_driver.c	5 Mar 2004 13:40:22 -0000	1.1.4.2
+++ b/lg_driver.c	15 Apr 2004 10:16:20 -0000	1.1.4.3
@@ -246,7 +246,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	LG_MAJOR_VERSION, LG_MINOR_VERSION, LG_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,