From b54fef6644d1ff9f18ccaefbaca1a1de0699cf86 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Sat, 14 Jun 2008 10:26:24 -0700 Subject: [PATCH] --- yaml --- r: 104975 b: refs/heads/master c: 740f370dc61dc478d891d7d47660bb3ae39ddb4f h: refs/heads/master i: 104973: e110e320dd0f9532c227e5e563c0a3c6f65c1816 104971: 8cc6ffd70c38449d28f2340ec3ca7b486205a6eb 104967: 22252553ad3731dd9df946cdc0a7a0023a2f8993 104959: d71e945b902091bfa6158a8ea3a843401e9733b9 v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-quirks.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e12b4a2010b0..5de65a1c83cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a44ebccea873cf7d58b63605f1cdd6da9dfec70f +refs/heads/master: 740f370dc61dc478d891d7d47660bb3ae39ddb4f diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c index ba22eec200cd..f35c2d1d53a0 100644 --- a/trunk/drivers/hid/usbhid/hid-quirks.c +++ b/trunk/drivers/hid/usbhid/hid-quirks.c @@ -247,6 +247,8 @@ #define USB_DEVICE_ID_LD_MACHINETEST 0x2040 #define USB_VENDOR_ID_LOGITECH 0x046d +#define USB_DEVICE_ID_LOGITECH_LX3 0xc044 +#define USB_DEVICE_ID_LOGITECH_V150 0xc047 #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 #define USB_DEVICE_ID_LOGITECH_HARMONY 0xc110 #define USB_DEVICE_ID_LOGITECH_HARMONY_2 0xc111 @@ -599,6 +601,8 @@ static const struct hid_blacklist { { 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_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3, HID_QUIRK_INVERT_HWHEEL }, + { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150, HID_QUIRK_INVERT_HWHEEL }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K, HID_QUIRK_MICROSOFT_KEYS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K, HID_QUIRK_MICROSOFT_KEYS },