# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1190714470 0
# Node ID 82f1c4c3d13a31df7ce8ce144a9346bee97c9ef9
# Parent  12ea0fdc0df233c2fd61d623020f98fba185fb0f
Merged r3449:3450 from branches/SDL-1.2: SDL_config.h.in Linux joystick fix.

diff -r 12ea0fdc0df2 -r 82f1c4c3d13a include/SDL_config.h.in
--- a/include/SDL_config.h.in	Mon Sep 10 12:20:02 2007 +0000
+++ b/include/SDL_config.h.in	Tue Sep 25 10:01:10 2007 +0000
@@ -201,6 +201,7 @@
 #undef SDL_CDROM_WIN32
 
 /* Enable various input drivers */
+#undef SDL_INPUT_LINUXEV
 #undef SDL_INPUT_TSLIB
 #undef SDL_JOYSTICK_BEOS
 #undef SDL_JOYSTICK_DC
@@ -208,7 +209,6 @@
 #undef SDL_JOYSTICK_DUMMY
 #undef SDL_JOYSTICK_IOKIT
 #undef SDL_JOYSTICK_LINUX
-#undef SDL_JOYSTICK_LINUXEV
 #undef SDL_JOYSTICK_MINT
 #undef SDL_JOYSTICK_OS2
 #undef SDL_JOYSTICK_RISCOS