Merge branch 'upstream' into for-linus
[~shefty/rdma-dev.git] / drivers / hid / hid-multitouch.c
index 6fb46d70f39d3f44b9b75196d0f5c5d55ab80066..1d5b94167b521566268d91077b307c68a29d04cc 100644 (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) },
 
                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,
        /* GoodTouch panels */
        { .driver_data = MT_CLS_DEFAULT,
                HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,