diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2013-08-30 08:10:07 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-02 07:38:38 -0400 |
commit | a4be0ed39f2b1ea990804ea54e39bc42d17ed5a5 (patch) | |
tree | 464e657fb857ea9d178003a37f1bdba35b419174 /drivers/hid | |
parent | 1cde501bb4655e98fb832194beb88ac73be5a05d (diff) |
HID: roccat: add support for KonePureOptical v2
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>
Diffstat (limited to 'drivers/hid')
-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 627fea6593a3..3c28e5bf3675 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1694,6 +1694,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1694 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) }, | 1694 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) }, |
1695 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) }, | 1695 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) }, |
1696 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, | 1696 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE) }, |
1697 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPURE_OPTICAL) }, | ||
1697 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) }, | 1698 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) }, |
1698 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_LUA) }, | 1699 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_LUA) }, |
1699 | { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) }, | 1700 | { 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 01f1b876fb9d..6ad292eee4ce 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -715,6 +715,7 @@ | |||
715 | #define USB_DEVICE_ID_ROCCAT_KONE 0x2ced | 715 | #define USB_DEVICE_ID_ROCCAT_KONE 0x2ced |
716 | #define USB_DEVICE_ID_ROCCAT_KONEPLUS 0x2d51 | 716 | #define USB_DEVICE_ID_ROCCAT_KONEPLUS 0x2d51 |
717 | #define USB_DEVICE_ID_ROCCAT_KONEPURE 0x2dbe | 717 | #define USB_DEVICE_ID_ROCCAT_KONEPURE 0x2dbe |
718 | #define USB_DEVICE_ID_ROCCAT_KONEPURE_OPTICAL 0x2db4 | ||
718 | #define USB_DEVICE_ID_ROCCAT_KONEXTD 0x2e22 | 719 | #define USB_DEVICE_ID_ROCCAT_KONEXTD 0x2e22 |
719 | #define USB_DEVICE_ID_ROCCAT_KOVAPLUS 0x2d50 | 720 | #define USB_DEVICE_ID_ROCCAT_KOVAPLUS 0x2d50 |
720 | #define USB_DEVICE_ID_ROCCAT_LUA 0x2c2e | 721 | #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"); |