diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-05 23:30:42 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-05 23:31:15 +0200 |
| commit | 645832cce2955bdcd0c3166478b84ea7afd0ea53 (patch) | |
| tree | 5daea112580bc5467071423e1d7ea90dfb7cb4df /drivers/hid/hid-multitouch.c | |
| parent | 2c2110e90b5a859cea8eccad9d42a44da9bfdc2a (diff) | |
| parent | 9ed326951806c424b42dcf2e1125e25a98fb13d1 (diff) | |
| download | linux-645832cce2955bdcd0c3166478b84ea7afd0ea53.tar.gz linux-645832cce2955bdcd0c3166478b84ea7afd0ea53.tar.bz2 linux-645832cce2955bdcd0c3166478b84ea7afd0ea53.zip | |
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index b10c2044d893..ece7cef915a9 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, |