Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into...
Jiri Kosina [Thu, 25 Feb 2010 16:39:16 +0000 (17:39 +0100)]
Conflicts:
drivers/hid/Kconfig

1  2 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c
drivers/hid/usbhid/hid-core.c
include/linux/hid.h

@@@ -189,14 -183,15 +189,23 @@@ config LOGIRUMBLEPAD2_F
          Say Y here if you want to enable force feedback support for Logitech
          Rumblepad 2 devices.
  
 +config LOGIG940_FF
 +      bool "Logitech Flight System G940 force feedback support"
 +      depends on HID_LOGITECH
 +      select INPUT_FF_MEMLESS
 +      help
 +        Say Y here if you want to enable force feedback support for Logitech
 +        Flight System G940 devices.
 +
+ config HID_MAGICMOUSE
+       tristate "Apple MagicMouse multi-touch support"
+       depends on BT_HIDP
+       ---help---
+       Support for the Apple Magic Mouse multi-touch.
+       Say Y here if you want support for the multi-touch features of the
+       Apple Wireless "Magic" Mouse.
  config HID_MICROSOFT
        tristate "Microsoft" if EMBEDDED
        depends on USB_HID
@@@ -35,12 -31,10 +35,13 @@@ obj-$(CONFIG_HID_GYRATION) += hid-gyrat
  obj-$(CONFIG_HID_KENSINGTON)  += hid-kensington.o
  obj-$(CONFIG_HID_KYE)         += hid-kye.o
  obj-$(CONFIG_HID_LOGITECH)    += hid-logitech.o
+ obj-$(CONFIG_HID_MAGICMOUSE)    += hid-magicmouse.o
  obj-$(CONFIG_HID_MICROSOFT)   += hid-microsoft.o
  obj-$(CONFIG_HID_MONTEREY)    += hid-monterey.o
 +obj-$(CONFIG_HID_MOSART)      += hid-mosart.o
  obj-$(CONFIG_HID_NTRIG)               += hid-ntrig.o
 +obj-$(CONFIG_HID_ORTEK)               += hid-ortek.o
 +obj-$(CONFIG_HID_QUANTA)      += hid-quanta.o
  obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
  obj-$(CONFIG_HID_PETALYNX)    += hid-petalynx.o
  obj-$(CONFIG_HID_SAMSUNG)     += hid-samsung.o
@@@ -1340,14 -1339,11 +1342,15 @@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
Simple merge
Simple merge
Simple merge
Simple merge