First version of Ryan Gorodon's SDL work:

16:24 < icculus> check that in, someone will fix it.  :)

code/unix/linux_joystick.c

@@ -30,6 +30,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
 */
 
+#if !USE_SDL
+
 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -204,4 +206,6 @@ void IN_JoyMove( void )
   old_axes = axes;
 }
 
+#endif // !USE_SDL
+