diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:33 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:33 +0000 |
| commit | e220e28182a4828e0e6745a591607cefa94888d3 (patch) | |
| tree | 359436e1bbf12d975724dd46715fea82c6017939 | |
| parent | b8f5b0295c45e0d6a0ff7d0bc6ce7225350f3cdd (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/nsc.man | 6 | ||||
| -rw-r--r-- | src/nsc_driver.c | 2 | ||||
| -rw-r--r-- | src/nsc_gx1_accel.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/man/nsc.man b/man/nsc.man index 048abe9..d9addac 100644 --- a/man/nsc.man +++ b/man/nsc.man @@ -14,7 +14,7 @@ nsc \- Nsc video driver .fi .SH DESCRIPTION .B nsc -is an XFree86 driver for National Semiconductors GEODE processor family. +is an __xservername__ driver for National Semiconductors GEODE processor family. It uses the DURANGO kit provided by National Semiconductor. The driver is accelerated, and provides support for the following framebuffer depths: 8, 16 and 24. @@ -24,7 +24,7 @@ The driver supports GXLV (5530 companion chip), SC1200, SC1400 and GX2 (5535 companion chip). .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 @@ -129,6 +129,6 @@ view on TV. The parameters xx: X-offset, yy: Y-offset, ww: Viewable width, hh: Viewable height. Default: no TV. .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHOR Author: Sarma V. Kolluru diff --git a/src/nsc_driver.c b/src/nsc_driver.c index bc49fc7..e312683 100644 --- a/src/nsc_driver.c +++ b/src/nsc_driver.c @@ -398,7 +398,7 @@ static XF86ModuleVersionInfo NscVersionRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, NSC_VERSION_MAJOR, NSC_VERSION_MINOR, NSC_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, diff --git a/src/nsc_gx1_accel.c b/src/nsc_gx1_accel.c index 46f8dfb..4937f5e 100644 --- a/src/nsc_gx1_accel.c +++ b/src/nsc_gx1_accel.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.8 2003/12/07 23:18:16 alanh Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.2 2004/04/23 19:40:15 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.7 2003/12/07 22:40:38 alanh Exp $ */ /* * $Workfile: nsc_gx1_accel.c $ |