diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:38:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:38:54 +0200 |
| commit | cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa (patch) | |
| tree | 46673a3c432958a4f712b064ddb9b645771cc0c3 /drivers/hid/hid-ids.h | |
| parent | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (diff) | |
| parent | f5ff4e1e62408327d27fb1e1ab00e96a52b7cd46 (diff) | |
Merge branch 'multitouch' into for-linus
Conflicts:
drivers/hid/hid-multitouch.c
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c1da94a81a0..ca4d83e6e38 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -268,7 +268,11 @@ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA 0x72fa #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302 0x7302 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7 0x73f7 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224 0x7224 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0 0x72d0 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4 0x72c4 #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 @@ -310,6 +314,7 @@ #define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc #define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0003 +#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS 0x0100 #define USB_VENDOR_ID_GLAB 0x06c2 #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038 |