diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 15:43:05 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 15:43:05 (GMT) |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/hid/hid-cando.c | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
| download | linux-2198a10b501fd4443430cb17e065a9e859cc58c9.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/hid/hid-cando.c')
| -rw-r--r-- | drivers/hid/hid-cando.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-cando.c b/drivers/hid/hid-cando.c index 4267a6f..5925bdc 100644 --- a/drivers/hid/hid-cando.c +++ b/drivers/hid/hid-cando.c @@ -237,6 +237,8 @@ static const struct hid_device_id cando_devices[] = { USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, + USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, { } }; MODULE_DEVICE_TABLE(hid, cando_devices); |