diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:37 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:37 +0000 |
| commit | 6d81ed0fe5ed4fa19248ee4abe09261eecfb0f5e (patch) | |
| tree | 0a80399b157341727e5be3bd00778a7d8bcf5240 | |
| parent | 00c3949015010b8d47b8220e371cde41394360a5 (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/tdfx.man | 6 | ||||
| -rw-r--r-- | src/tdfx_driver.c | 2 | ||||
| -rw-r--r-- | src/tdfx_video.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/man/tdfx.man b/man/tdfx.man index ff838e2..17b3aba 100644 --- a/man/tdfx.man +++ b/man/tdfx.man @@ -14,13 +14,13 @@ tdfx \- 3Dfx video driver .fi .SH DESCRIPTION .B tdfx -is an XFree86 driver for 3Dfx video cards. +is an __xservername__ driver for 3Dfx video cards. .SH SUPPORTED HARDWARE The .B tdfx driver supports Voodoo Banshee, Voodoo3, Voodoo4 and Voodoo5 cards. .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 @@ -56,6 +56,6 @@ Default: off. .SH FILES tdfx_drv.o .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: ... diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c index 7957aab..c910461 100644 --- a/src/tdfx_driver.c +++ b/src/tdfx_driver.c @@ -279,7 +279,7 @@ static XF86ModuleVersionInfo tdfxVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TDFX_MAJOR_VERSION, TDFX_MINOR_VERSION, TDFX_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, diff --git a/src/tdfx_video.c b/src/tdfx_video.c index 09983f4..04b3cac 100644 --- a/src/tdfx_video.c +++ b/src/tdfx_video.c @@ -796,7 +796,7 @@ TDFXDisplayVideoOverlay( int dudx, dvdy; dudx = (src_w << 20) / drw_w; - /* subract 1 to eliminate garbage on last line */ + /* subtract 1 to eliminate garbage on last line */ dvdy = (( src_h - 1 )<< 20) / drw_h; offset += ((left >> 16) & ~1) << 1; |