summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:31:19 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:31:19 +0000
commit6865f1c8c0e3787b91bc67ba813f78e511aca280 (patch)
tree30b6b323dbabf0eff07c3250ebd8ff7dbbdfb41a
parent6b05567f222ad0c4f44ab3b480dc291f59fe47e9 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
-rw-r--r--man/ur98.man2
-rw-r--r--src/xf86Ur-98.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/man/ur98.man b/man/ur98.man
index b699a0f..9fa829e 100644
--- a/man/ur98.man
+++ b/man/ur98.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/ur98.man,v 1.1 2002/11/22 03:49:15 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man,v 1.1 2001/01/24 00:06:37 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH UR98 __drivermansuffix__ __vendorversion__
diff --git a/src/xf86Ur-98.c b/src/xf86Ur-98.c
index d61632f..a32f124 100644
--- a/src/xf86Ur-98.c
+++ b/src/xf86Ur-98.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1 2002/11/22 03:49:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v 1.1tsi Exp $ */
#include <sys/types.h>
#include <unistd.h>
@@ -21,7 +21,6 @@
#ifdef XFree86LOADER
#include "xf86Module.h"
-#endif
static const char *reqSymbols[] = {
"AddEnabledDevice",
@@ -65,6 +64,7 @@ static const char *reqSymbols[] = {
"xf86XInputSetSendCoreEvents",
NULL
};
+#endif