diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-03-14 15:27:36 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-03-14 15:27:36 +0100 |
| commit | c16527cdccaa5dbbda38c7886f9ac65129302e88 (patch) | |
| tree | f6d6651b42512ff7551b35fd1a237e6b8fa7619e /drivers/hid/hid-core.c | |
| parent | 3a75b24949a8d34d2014866006e30dc69dd567c8 (diff) | |
| parent | 0438ee7080ac83a6a831c52bc4e8c29dc2306e95 (diff) | |
| download | blackbird-obmc-linux-c16527cdccaa5dbbda38c7886f9ac65129302e88.tar.gz blackbird-obmc-linux-c16527cdccaa5dbbda38c7886f9ac65129302e88.zip | |
Merge branch 'for-3.15/hid-cp2112' into for-3.15/hid-core-ll-transport-cleanup
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 0b57babe3f9f..ddb981db08bd 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1732,6 +1732,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) }, { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_CP2112) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) }, |
