[Xorg-commit] xc/programs/Xserver/hw/xfree86/input/ur98 xf86Ur-98.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/ur98
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/input/ur98

Modified Files:
      Tag: XORG-CURRENT
	xf86Ur-98.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xf86Ur-98.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/ur98/xf86Ur-98.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/xf86Ur-98.c	14 Nov 2003 16:48:56 -0000	1.1
+++ b/xf86Ur-98.c	23 Feb 2004 21:36:37 -0000	1.1.4.1
@@ -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.2 2003/12/22 17:48:10 tsi 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 @@
 	"xf86XInputSetSendCoreEvents",
 	NULL
 };
+#endif