apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into for-linus

Browse Source 
Conflicts:
	drivers/hid/Makefile
This commit is contained in:
Jiri Kosina
2012-03-20 13:18:05 +01:00
parent 77aa8e65f0 4d5df5d11e
commit 4a247a4119
15 changed files with 860 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/hid/hid-multitouch.c
+5
View File
@@ -837,6 +837,11 @@ static const struct hid_device_id mt_devices[] = {
HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
/* Gametel game controller */
{ .driver_data = MT_CLS_DEFAULT,
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_FRUCTEL,
USB_DEVICE_ID_GAMETEL_MT_MODE) },
/* GoodTouch panels */
{ .driver_data = MT_CLS_DEFAULT,
HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,