diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:31 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:31 +0000 |
| commit | e3746b33e82517e3417fa1ad4953c8953d24fcce (patch) | |
| tree | 99c9a7faed86eb0d9026433d02f309f8562d8d81 | |
| parent | d936b84cf9ec2d996f710637f9fbeb50fa2bcdf8 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | man/neomagic.man | 6 | ||||
| -rw-r--r-- | src/neo_driver.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/neomagic.man b/man/neomagic.man index 7753935..040e0eb 100644 --- a/man/neomagic.man +++ b/man/neomagic.man @@ -14,7 +14,7 @@ neomagic \- Neomagic video driver .fi .SH DESCRIPTION .B neomagic -is an XFree86 driver for the Neomagic graphics chipsets found in many +is an __xservername__ driver for the Neomagic graphics chipsets found in many laptop computers. .SH SUPPORTED HARDWARE .B neomagic @@ -46,7 +46,7 @@ and newer models. All visuals are supported in depth 8. TrueColor and DirectColor visuals are supported in the other depths. .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. .PP @@ -90,7 +90,7 @@ following options are needed to avoid a lock-up of the graphic engine: .fi .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: Jens Owen, Kevin E. Martin, and also Egbert Eich, Mark Vojkovich, Alan Hourihane. diff --git a/src/neo_driver.c b/src/neo_driver.c index 73acb09..13be9f3 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -492,7 +492,7 @@ static XF86ModuleVersionInfo neoVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, NEO_MAJOR_VERSION, NEO_MINOR_VERSION, NEO_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |