diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:35 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:35 +0000 |
| commit | 4d80bcae4d450395864b39a267cbb659342af67d (patch) | |
| tree | 192e69eba3ef7c5818d823ba7cae62d43266b787 | |
| parent | 6f939db2b40f27be48e000ddef0d851724f7991b (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/nv.man | 6 | ||||
| -rw-r--r-- | src/nv_driver.c | 4 | ||||
| -rw-r--r-- | src/riva_driver.c | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -14,7 +14,7 @@ nv \- NVIDIA video driver .fi .SH DESCRIPTION .B nv -is an XFree86 driver for NVIDIA video cards. The driver supports 2D +is an __xservername__ driver for NVIDIA video cards. The driver supports 2D acceleration and provides support for the following framebuffer depths: 8, 15, 16 (except Riva128) and 24. All visual types are supported for depth 8, TrueColor and DirectColor @@ -53,7 +53,7 @@ NV17, NV18, NV25, NV28 .B GeForce FX, QUADRO FX NV30, NV31, NV34, NV35, NV36, NV38 .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 @@ -114,7 +114,7 @@ is used. .BI "Option \*qShadowFB\*q \*q" boolean \*q Enable or disable use of the shadow framebuffer layer. Default: off. .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: David McKay, Jarno Paananen, Chas Inman, Dave Schmenk, Mark Vojkovich diff --git a/src/nv_driver.c b/src/nv_driver.c index 58c44be..ee019c3 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.1.4.2 2003/12/20 00:28:27 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.2 2004/04/23 19:42:10 eich Exp $ */ /* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */ /* * Copyright 1996-1997 David J. McKay @@ -328,7 +328,7 @@ static XF86ModuleVersionInfo nvVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, diff --git a/src/riva_driver.c b/src/riva_driver.c index daf7b9c..bfc3ac7 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -172,7 +172,7 @@ static XF86ModuleVersionInfo rivaVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, RIVA_MAJOR_VERSION, RIVA_MINOR_VERSION, RIVA_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, |