Merge branch 'multitouch' into for-linus

Conflicts:
	drivers/hid/hid-multitouch.c

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-multitouch.c
index ee0b76b398cb5a6a6fcda16dedbadff404d8f643,9f3c5bf4dde3a4c03eff895a1ea086381a339fdd..3eb02b94fc87c8a3bc903474db7c3b55efd5ead5
--- 1/drivers/hid/hid-multitouch.c
--- 2/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -116,7 -115,8 +116,9 @@@ struct mt_device 
  #define MT_CLS_EGALAX_SERIAL                  0x0104
  #define MT_CLS_TOPSEED                                0x0105
  #define MT_CLS_PANASONIC                      0x0106
 -#define MT_CLS_GENERALTOUCH_TWOFINGERS                0x0107
 -#define MT_CLS_GENERALTOUCH_PWT_TENFINGERS    0x0108
 +#define MT_CLS_FLATFROG                               0x0107
++#define MT_CLS_GENERALTOUCH_TWOFINGERS                0x0108
++#define MT_CLS_GENERALTOUCH_PWT_TENFINGERS    0x0109
  
  #define MT_DEFAULT_MAXCONTACT 10
  
@@@ -200,13 -217,18 +202,24 @@@ static struct mt_class mt_classes[] = 
        { .name = MT_CLS_PANASONIC,
                .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP,
                .maxcontacts = 4 },
+       { .name = MT_CLS_GENERALTOUCH_TWOFINGERS,
+               .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
+                       MT_QUIRK_VALID_IS_INRANGE |
+                       MT_QUIRK_SLOT_IS_CONTACTNUMBER,
+               .maxcontacts = 2
+       },
+       { .name = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
+               .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
+                       MT_QUIRK_SLOT_IS_CONTACTNUMBER,
+               .maxcontacts = 10
+       },
  
 +      { .name = MT_CLS_FLATFROG,
 +              .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
 +                      MT_QUIRK_NO_AREA,
 +              .sn_move = 2048,
 +              .maxcontacts = 40,
 +      },
        { }
  };
  
@@@ -871,15 -941,13 +920,18 @@@ static const struct hid_device_id mt_de
                MT_USB_DEVICE(USB_VENDOR_ID_ELO,
                        USB_DEVICE_ID_ELO_TS2515) },
  
 +      /* Flatfrog Panels */
 +      { .driver_data = MT_CLS_FLATFROG,
 +              MT_USB_DEVICE(USB_VENDOR_ID_FLATFROG,
 +                      USB_DEVICE_ID_MULTITOUCH_3200) },
 +
        /* GeneralTouch panel */
-       { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
+       { .driver_data = MT_CLS_GENERALTOUCH_TWOFINGERS,
                MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
                        USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
+       { .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,
+               MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
+                       USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) },
  
        /* Gametel game controller */
        { .driver_data = MT_CLS_DEFAULT,