From dffc7e20122d9bd5cd69bb15effa876dcec44cb9 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 15 Apr 2004 10:16:37 +0000 Subject: Merged changes from RELEASE-1 branch --- man/sunffb.man | 6 +++--- src/ffb_driver.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/sunffb.man b/man/sunffb.man index 5f0a869..2180add 100644 --- a/man/sunffb.man +++ b/man/sunffb.man @@ -14,17 +14,17 @@ ffb \- SUNFFB video driver .fi .SH DESCRIPTION .B ffb -is an XFree86 driver for Sun Creator, Creator 3D and Elite 3D video cards. +is an __xservername__ driver for Sun Creator, Creator 3D and Elite 3D video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B ffb 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: Jakub Jelinek , David S. Miller , Michal Rehacek diff --git a/src/ffb_driver.c b/src/ffb_driver.c index e699eef..0c3d4ce 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -114,7 +114,7 @@ static XF86ModuleVersionInfo sunffbVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, FFB_MAJOR_VERSION, FFB_MINOR_VERSION, FFB_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, -- cgit v1.2.3