Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402285

src/joystick/darwin/SDL_sysjoystick.c

@@ -690,9 +690,10 @@ SDL_SYS_JoystickInit(void)
 */
 
         /* Filter device list to non-keyboard/mouse stuff */
-        if ((device->usagePage != kHIDPage_GenericDesktop) ||
+        if ( (device->usagePage != kHIDPage_GenericDesktop) ||
              ((device->usage != kHIDUsage_GD_Joystick &&
-              device->usage != kHIDUsage_GD_GamePad))) {
+               device->usage != kHIDUsage_GD_GamePad &&
+               device->usage != kHIDUsage_GD_MultiAxisController)) ) {
 
             /* release memory for the device */
             HIDDisposeDevice(&device);