Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -250,12 +250,12 @@ static struct mt_class mt_classes[] = {
|
||||
{ .name = MT_CLS_GENERALTOUCH_TWOFINGERS,
|
||||
.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
|
||||
MT_QUIRK_VALID_IS_INRANGE |
|
||||
MT_QUIRK_SLOT_IS_CONTACTNUMBER,
|
||||
MT_QUIRK_SLOT_IS_CONTACTID,
|
||||
.maxcontacts = 2
|
||||
},
|
||||
{ .name = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
|
||||
.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
|
||||
MT_QUIRK_SLOT_IS_CONTACTNUMBER
|
||||
MT_QUIRK_SLOT_IS_CONTACTID
|
||||
},
|
||||
|
||||
{ .name = MT_CLS_FLATFROG,
|
||||
@@ -1200,6 +1200,21 @@ static const struct hid_device_id mt_devices[] = {
|
||||
{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) },
|
||||
{ .driver_data = MT_CLS_GENERALTOUCH_TWOFINGERS,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101) },
|
||||
{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102) },
|
||||
{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106) },
|
||||
{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A) },
|
||||
{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100) },
|
||||
|
||||
/* Gametel game controller */
|
||||
{ .driver_data = MT_CLS_NSMU,
|
||||
@@ -1314,6 +1329,14 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_QUANTA,
|
||||
USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) },
|
||||
|
||||
/* SiS panels */
|
||||
{ .driver_data = MT_CLS_DEFAULT,
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,
|
||||
USB_DEVICE_ID_SIS9200_TOUCH) },
|
||||
{ .driver_data = MT_CLS_DEFAULT,
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,
|
||||
USB_DEVICE_ID_SIS817_TOUCH) },
|
||||
|
||||
/* Stantum panels */
|
||||
{ .driver_data = MT_CLS_CONFIDENCE,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_STANTUM,
|
||||
@@ -1342,6 +1365,12 @@ static const struct hid_device_id mt_devices[] = {
|
||||
{ .driver_data = MT_CLS_NSMU,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_UNITEC,
|
||||
USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
|
||||
|
||||
/* Wistron panels */
|
||||
{ .driver_data = MT_CLS_NSMU,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_WISTRON,
|
||||
USB_DEVICE_ID_WISTRON_OPTICAL_TOUCH) },
|
||||
|
||||
/* XAT */
|
||||
{ .driver_data = MT_CLS_NSMU,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_XAT,
|
||||
|
||||
Reference in New Issue
Block a user