summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:36 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:36 +0000
commitd2f12b777c149e2550db3ea1412e646725b61bf5 (patch)
tree5490c5f2c13081a9b21e91ab3c1d219054d28219
parentfa8a01f1b031f8c9843c565e6fee6422f035345d (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/sunffb.man6
-rw-r--r--src/ffb_driver.c2
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 <jakub@redhat.com>, David S. Miller <davem@redhat.com>, Michal Rehacek <majkl@iname.com>
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,