diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-05-05 21:30:42 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-05 21:31:15 (GMT) |
commit | 645832cce2955bdcd0c3166478b84ea7afd0ea53 (patch) | |
tree | 5daea112580bc5467071423e1d7ea90dfb7cb4df /drivers/hid/hid-core.c | |
parent | 2c2110e90b5a859cea8eccad9d42a44da9bfdc2a (diff) | |
parent | 9ed326951806c424b42dcf2e1125e25a98fb13d1 (diff) | |
download | linux-645832cce2955bdcd0c3166478b84ea7afd0ea53.tar.xz |
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-core.c')
-rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 0a107fe..df2ca0a 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1497,6 +1497,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, + { HID_USB_DEVICE(USB_VENDOR_ID_BAANTO, USB_DEVICE_ID_BAANTO_MT_190W2), }, { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, |