From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 25 Feb 2010 16:39:16 +0000 (+0100)
Subject: Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=14ef2b0c026558d37662e5e095d59c64597d5769;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
	drivers/hid/Kconfig
---

14ef2b0c026558d37662e5e095d59c64597d5769
diff --cc drivers/hid/Kconfig
index 2b93d7f647ee,0e668ccc2511..71d4c0703629
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -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
diff --cc drivers/hid/Makefile
index 03051694d546,45d81e9cd2de..0b2618f092ca
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -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
diff --cc drivers/hid/hid-core.c
index da97195474ff,f038422f432c..368fbb0c4ca6
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -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) },