From 1e647efa6a3d8eec286e094510e34b5fc15a5fdf Mon Sep 17 00:00:00 2001 From: Carlos Corbacho Date: Sat, 17 Nov 2007 01:30:25 +0100 Subject: [PATCH] --- yaml --- r: 77647 b: refs/heads/master c: bc3707335c9eee214e663fdd8935b649fec9bf3a h: refs/heads/master i: 77645: 150ce7ab0756d74860082a276f8869dc45a96df7 77643: 23c86205f9d45b820ab660cea32550100ba85563 77639: ae215bdf716d4dcb9589e2533cffd6e5db8393bb 77631: 8d3c7ac3e8b79e634978aaa00d36eeac41652e11 v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-quirks.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3d78a7e0fef5..9c50e035243b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af9e0eacdc072ba28fd139b90de27023d9cb0598 +refs/heads/master: bc3707335c9eee214e663fdd8935b649fec9bf3a diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c index 0ab18a401b77..006cea22d906 100644 --- a/trunk/drivers/hid/usbhid/hid-quirks.c +++ b/trunk/drivers/hid/usbhid/hid-quirks.c @@ -283,6 +283,7 @@ #define USB_DEVICE_ID_LOGITECH_HARMONY_63 0xc14e #define USB_DEVICE_ID_LOGITECH_HARMONY_64 0xc14f #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 +#define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a #define USB_DEVICE_ID_LOGITECH_KBD 0xc311 #define USB_DEVICE_ID_S510_RECEIVER 0xc50c #define USB_DEVICE_ID_S510_RECEIVER_2 0xc517 @@ -524,6 +525,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },