summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-multitouch.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-05-05 23:30:42 +0200
committerJiri Kosina <jkosina@suse.cz>2012-05-05 23:31:15 +0200
commit645832cce2955bdcd0c3166478b84ea7afd0ea53 (patch)
tree5daea112580bc5467071423e1d7ea90dfb7cb4df /drivers/hid/hid-multitouch.c
parent2c2110e90b5a859cea8eccad9d42a44da9bfdc2a (diff)
parent9ed326951806c424b42dcf2e1125e25a98fb13d1 (diff)
downloadop-kernel-dev-645832cce2955bdcd0c3166478b84ea7afd0ea53.zip
op-kernel-dev-645832cce2955bdcd0c3166478b84ea7afd0ea53.tar.gz
Merge branch 'multitouch' into device-groups
I am merging multitouch branch into device-groups so that support for Baanto device can be adjusted accordingly to the new autoloading patches. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r--drivers/hid/hid-multitouch.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index b10c204..ece7cef 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -760,6 +760,10 @@ static const struct hid_device_id mt_devices[] = {
MT_USB_DEVICE(USB_VENDOR_ID_ATMEL,
USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },
+ /* Baanto multitouch devices */
+ { .driver_data = MT_CLS_DEFAULT,
+ HID_USB_DEVICE(USB_VENDOR_ID_BAANTO,
+ USB_DEVICE_ID_BAANTO_MT_190W2) },
/* Cando panels */
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
MT_USB_DEVICE(USB_VENDOR_ID_CANDO,
OpenPOWER on IntegriCloud