From ecc703d708acde7fbb8bda418d09ef42b1cab4b4 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 18 Mar 2007 22:39:24 +0000
Subject: [PATCH] Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis
 joystick support.

---
 src/joystick/darwin/SDL_sysjoystick.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 42f90d521..9ff49842e 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/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) ||
-            ((device->usage != kHIDUsage_GD_Joystick &&
-              device->usage != kHIDUsage_GD_GamePad))) {
+        if ( (device->usagePage != kHIDPage_GenericDesktop) ||
+             ((device->usage != kHIDUsage_GD_Joystick &&
+               device->usage != kHIDUsage_GD_GamePad &&
+               device->usage != kHIDUsage_GD_MultiAxisController)) ) {
 
             /* release memory for the device */
             HIDDisposeDevice(&device);