From 23dc5b0296491889890d925e15a71fc3dfa9d970 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 15 Apr 2004 10:16:40 +0000 Subject: Merged changes from RELEASE-1 branch --- man/v4l.man | 8 ++++---- src/v4l.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/v4l.man b/man/v4l.man index 38014b7..ab2f844 100644 --- a/man/v4l.man +++ b/man/v4l.man @@ -13,9 +13,9 @@ v4l \- video4linux driver .fi .SH DESCRIPTION .B v4l -is an XFree86 driver for video4linux cards. It provides a Xvideo +is an __xservername__ driver for video4linux cards. It provides a Xvideo extention port for video overlay. Just add the driver to the module -list within the module section of your XF86Config file if you want +list within the module section of your __xconfigfile__ file if you want to use it. There are no config options. .P Note that the the extmod module is also required for the Xvideo @@ -30,10 +30,10 @@ overlay. bt848/bt878-based TV cards are the most popular hardware these days. .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: Gerd Knorr diff --git a/src/v4l.c b/src/v4l.c index 11ff025..9899743 100644 --- a/src/v4l.c +++ b/src/v4l.c @@ -50,7 +50,7 @@ static XF86ModuleVersionInfo v4lVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 0, 0, 1, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, -- cgit v1.2.3