diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2013-08-30 08:10:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 19:08:35 -0400 |
commit | a873420aa42b4c96a9ea9900855856bfea8558d2 (patch) | |
tree | 0e53851b117718b82747344b24cce8f4d3230eaa | |
parent | 322d9a97c490b890975e0d61f2b034bc18ea1100 (diff) |
HID: roccat: add support for KonePureOptical v2
commit a4be0ed39f2b1ea990804ea54e39bc42d17ed5a5 upstream.
KonePureOptical is a KonePure with different sensor.
Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-roccat-konepure.c | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index c561293624a7..e04bf0ef93a9 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1755,6 +1755,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1755 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) }, | 1755 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) }, |
1756 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) }, | 1756 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) }, |
1757 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, | 1757 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, |
1758 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE_OPTICAL) }, | ||
1758 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) }, | 1759 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) }, |
1759 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_LUA) }, | 1760 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_LUA) }, |
1760 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) }, | 1761 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ca0219f98c65..114fd1661834 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -705,6 +705,7 @@ | |||
705 | #define USB_DEVICE_ID_ROCCAT_KONE 0x2ced | 705 | #define USB_DEVICE_ID_ROCCAT_KONE 0x2ced |
706 | #define USB_DEVICE_ID_ROCCAT_KONEPLUS 0x2d51 | 706 | #define USB_DEVICE_ID_ROCCAT_KONEPLUS 0x2d51 |
707 | #define USB_DEVICE_ID_ROCCAT_KONEPURE 0x2dbe | 707 | #define USB_DEVICE_ID_ROCCAT_KONEPURE 0x2dbe |
708 | #define USB_DEVICE_ID_ROCCAT_KONEPURE_OPTICAL 0x2db4 | ||
708 | #define USB_DEVICE_ID_ROCCAT_KONEXTD 0x2e22 | 709 | #define USB_DEVICE_ID_ROCCAT_KONEXTD 0x2e22 |
709 | #define USB_DEVICE_ID_ROCCAT_KOVAPLUS 0x2d50 | 710 | #define USB_DEVICE_ID_ROCCAT_KOVAPLUS 0x2d50 |
710 | #define USB_DEVICE_ID_ROCCAT_LUA 0x2c2e | 711 | #define USB_DEVICE_ID_ROCCAT_LUA 0x2c2e |
diff --git a/drivers/hid/hid-roccat-konepure.c b/drivers/hid/hid-roccat-konepure.c index c79d0b06c143..5850959d48f5 100644 --- a/drivers/hid/hid-roccat-konepure.c +++ b/drivers/hid/hid-roccat-konepure.c | |||
@@ -262,6 +262,7 @@ static int konepure_raw_event(struct hid_device *hdev, | |||
262 | 262 | ||
263 | static const struct hid_device_id konepure_devices[] = { | 263 | static const struct hid_device_id konepure_devices[] = { |
264 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, | 264 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, |
265 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE_OPTICAL) }, | ||
265 | { } | 266 | { } |
266 | }; | 267 | }; |
267 | 268 | ||
@@ -300,5 +301,5 @@ module_init(konepure_init); | |||
300 | module_exit(konepure_exit); | 301 | module_exit(konepure_exit); |
301 | 302 | ||
302 | MODULE_AUTHOR("Stefan Achatz"); | 303 | MODULE_AUTHOR("Stefan Achatz"); |
303 | MODULE_DESCRIPTION("USB Roccat KonePure driver"); | 304 | MODULE_DESCRIPTION("USB Roccat KonePure/Optical driver"); |
304 | MODULE_LICENSE("GPL v2"); | 305 | MODULE_LICENSE("GPL v2"); |