From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 19 May 2010 12:27:08 +0000 (+0200)
Subject: Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=36dbe2fc5534291d261a4c63033232aa2f60c2a9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

Conflicts:
	drivers/hid/Makefile
---

36dbe2fc5534291d261a4c63033232aa2f60c2a9
diff --cc drivers/hid/Makefile
index 2e196c734d2a,0b2618f092ca,7fd1614e7e2c,f637b388030f,08b83ccd9d1b..22e47eaeea32
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@@@ -46,6 -44,6 -44,7 -45,6 -44,7 +47,8 @@@@@@ obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prod
     obj-$(CONFIG_HID_QUANTA)	+= hid-quanta.o
     obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o
     obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o
++ ++obj-$(CONFIG_HID_PICOLCD)	+= hid-picolcd.o
++++ obj-$(CONFIG_HID_ROCCAT_KONE)	+= hid-roccat-kone.o
     obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o
     obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o
     obj-$(CONFIG_HID_SONY)		+= hid-sony.o
diff --cc drivers/hid/hid-core.c
index ef492d3d52ee,143e788b729b,bb11fb460d55,1c57a9391c8f,5c5a821cd4cb..e10e314d38cc
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@ -1281,12 -1290,9 -1295,8 -1290,10 -1295,8 +1281,13 @@@@@@ static const struct hid_device_id hid_b
     	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
 ++++	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
 ++++	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
 ++++	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
  + +	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+++ +	{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
@@@@@@ -1337,8 -1342,7 -1348,7 -1343,7 -1346,8 +1340,9 @@@@@@
     	{ 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_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) },
     	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
 ++++	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
     	{ 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) },