From 3ffd96d49daabdd54f156cc009c9280310cca3be Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Tue, 4 May 2004 19:43:46 +0000 Subject: Merge the new release from HEAD --- man/fpit.man | 6 +++--- src/xf86Fpit.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/fpit.man b/man/fpit.man index 6534338..a7e289d 100644 --- a/man/fpit.man +++ b/man/fpit.man @@ -15,7 +15,7 @@ fpit \- Fujitsu Stylistic input driver .fi .SH DESCRIPTION .B fpit -is an XFree86 input driver for Fujitsu Stylistic Tablet PCs. +is an __xservername__ input driver for Fujitsu Stylistic Tablet PCs. .PP The .B fpit @@ -35,7 +35,7 @@ Therefore the following must be added to one of your start-up scripts. .B setserial /dev/ttyS3 IRQ 15 baud_base 115200 port 0xfce8 .SH CONFIGURATION DETAILS -Please refer to XF86Config(5x) for general configuration +Please refer to __xconfigfile__(5x) 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 @@ -113,7 +113,7 @@ And for other Stylistic devices try: .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 Original FPIT port: Rob Tsuk and John Apfelbaum diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c index ec09f0b..0969a61 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -564,7 +564,7 @@ static void Unplug(pointer p) } static XF86ModuleVersionInfo version_rec = { - "fpit", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XF86_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, + "fpit", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, {0, 0, 0, 0} }; -- cgit v1.2.3