git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
[sfrench/cifs-2.6.git]
/
drivers
/
hid
/
hid-uclogic-params.c
diff --git
a/drivers/hid/hid-uclogic-params.c
b/drivers/hid/hid-uclogic-params.c
index 0187c9f8fc22c5567e934cc0cc2089877963c56e..273d784fff66df68bb7ab8166599ca343e939813 100644
(file)
--- a/
drivers/hid/hid-uclogic-params.c
+++ b/
drivers/hid/hid-uclogic-params.c
@@
-977,6
+977,8
@@
int uclogic_params_init(struct uclogic_params *params,
/* FALL THROUGH */
case VID_PID(USB_VENDOR_ID_HUION,
USB_DEVICE_ID_HUION_TABLET):
+ case VID_PID(USB_VENDOR_ID_HUION,
+ USB_DEVICE_ID_HUION_HS64):
case VID_PID(USB_VENDOR_ID_UCLOGIC,
USB_DEVICE_ID_HUION_TABLET):
case VID_PID(USB_VENDOR_ID_UCLOGIC,