diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
| commit | 61aeb5654bfa67ce225c1b102e9beb2aceb5e1a1 (patch) | |
| tree | 2afa5b75c368daf4752e9bb280082aca60fb4e1f | |
| parent | 32ff75600605a2c4fbbe5dabc286e587158c72d2 (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_3XORG-6_8_99_2XORG-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-- | src/xf86Jstk.c | 4 |
1 files 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 @@ -19,13 +19,13 @@ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. * */ -/* $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> #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) #define XFREE86_V4 1 #endif @@ -767,13 +767,13 @@ xf86JstkPlug(pointer module, static XF86ModuleVersionInfo xf86JstkVersionRec = { "joystick", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, {0, 0, 0, 0} /* signature, to be patched into the file by */ /* a tool */ |