diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:02 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:02 +0000 |
| commit | 682f15298c5d80c05698bebdb5297e3c06dc005c (patch) | |
| tree | 9ae8648d868588ebd18cc28a745bffda7a57161d | |
| parent | e672e5fea83a43f79bc6d68207d57135f154a0c3 (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | man/dmc.man | 7 | ||||
| -rw-r--r-- | src/xf86DMC.c | 4 | ||||
| -rw-r--r-- | src/xf86DMC.h | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/man/dmc.man b/man/dmc.man index f1e3bf1..22160b3 100644 --- a/man/dmc.man +++ b/man/dmc.man @@ -1,4 +1,3 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/dmc.man,v 1.1 2001/08/17 13:27:55 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH DMC __drivermansuffix__ __vendorversion__ @@ -18,7 +17,7 @@ dmc \- DMC input driver .B EndSection .SH DESCRIPTION .B dmc -is an XFree86 input driver for DMC FIT10-controller... +is an __xservername__ input driver for DMC FIT10-controller... .PP The .B dmc @@ -28,12 +27,12 @@ THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE What is supported... .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details and for options that can be used with all input drivers. This section only covers configuration details specific to this driver. .PP Config details... .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/xf86DMC.c b/src/xf86DMC.c index bbefc10..690c6d7 100644 --- a/src/xf86DMC.c +++ b/src/xf86DMC.c @@ -35,7 +35,7 @@ * - Make dectection work after restart of X */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/xf86DMC.c,v 1.3 2003/06/25 18:06:25 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/xf86DMC.c,v 1.1 2001/08/17 13:27:55 dawes Exp $ */ #define _DMC_C_ @@ -70,7 +70,7 @@ static XF86ModuleVersionInfo VersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, diff --git a/src/xf86DMC.h b/src/xf86DMC.h index 588e970..c551015 100644 --- a/src/xf86DMC.h +++ b/src/xf86DMC.h @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/xf86DMC.h,v 1.1 2001/08/17 13:27:55 dawes Exp $ */ +/* $XFree86$ */ #ifndef _DMC_H_ #define _DMC_H_ |