Attempt #3: Fixed boolean logic bug that caused all HID joysticks to be

rejected on MacOSX/Darwin. Works now. No, really this time.  --ryan.

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

src/joystick/darwin/SDL_sysjoystick.c

@@ -647,7 +647,7 @@ int 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_Joystick &&
 		      device->usage != kHIDUsage_GD_GamePad)) {
 
 			/* release memory for the device */