From a9bd3a7420f47c60315cec598fb02530b9266e7e Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 6 Mar 2012 10:53:45 +0100 Subject: [PATCH] --- yaml --- r: 291635 b: refs/heads/master c: 841cb1570d2c9eed4496ac9ce53c4fd4ae66ebfc h: refs/heads/master i: 291633: 9f1885cc29bfeb79dfcf3b6593eda9a8b198313d 291631: a419d01af1eb708ccd12f9a67e93e0d27fd26561 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-ids.h | 1 + trunk/drivers/hid/hid-multitouch.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9c60b15a82c7..766bdc3a3c64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2258e863b451be319d374f89688000ab858b13c3 +refs/heads/master: 841cb1570d2c9eed4496ac9ce53c4fd4ae66ebfc diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index 12b6c49359c8..5cb1d63a2a38 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -149,6 +149,7 @@ #define USB_VENDOR_ID_ATMEL 0x03eb #define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c +#define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER 0x2118 #define USB_VENDOR_ID_AVERMEDIA 0x07ca #define USB_DEVICE_ID_AVER_FM_MR800 0xb800 diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c index 09e42ef60d6e..03990a8bb827 100644 --- a/trunk/drivers/hid/hid-multitouch.c +++ b/trunk/drivers/hid/hid-multitouch.c @@ -743,6 +743,9 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_SERIAL, HID_USB_DEVICE(USB_VENDOR_ID_ATMEL, USB_DEVICE_ID_ATMEL_MULTITOUCH) }, + { .driver_data = MT_CLS_SERIAL, + HID_USB_DEVICE(USB_VENDOR_ID_ATMEL, + USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) }, /* Cando panels */ { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,