HID: move cypress quirks

[safe/jmp/linux-2.6] / drivers / hid / hid-input.c

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index a6223bc..f1df25a 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -515,13 +515,13 @@ mapped:
                                hidinput, field, usage, &bit, &max) < 0)
                goto ignore;
 
-       if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5 |
+       if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 |
                        HID_QUIRK_2WHEEL_MOUSE_HACK_B8)) && (usage->type == EV_REL) &&
                        (usage->code == REL_WHEEL))
                set_bit(REL_HWHEEL, bit);
 
-       if (((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
-               || ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007)))
+       if ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) &&
+                       (usage->hid == 0x00090007))
                goto ignore;
 
        set_bit(usage->type, input->evbit);