From 61aeb5654bfa67ce225c1b102e9beb2aceb5e1a1 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:03 +0000
Subject: Merging XORG-CURRENT into trunk

---
 src/xf86Jstk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xf86Jstk.c b/src/xf86Jstk.c
index 54bb2dc..566529f 100644
--- a/src/xf86Jstk.c
+++ b/src/xf86Jstk.c
@@ -22,7 +22,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/joystick/xf86Jstk.c,v 1.6 2001/12/26 21:51:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/joystick/xf86Jstk.c,v 1.5 2001/11/26 16:25:53 dawes Exp $ */
 
 #include <xf86Version.h>
 
@@ -770,7 +770,7 @@ static XF86ModuleVersionInfo xf86JstkVersionRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,
-- 
cgit v1.2.3