Merge branches 'debug-module-param' and 'upstream' into for-linus

1 files changed, 23 insertions, 13 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index eb53d9a9ae54..898103b401f1 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -263,19 +263,28 @@ struct hid_item {
 #define HID_QUIRK_2WHEEL_MOUSE_HACK_5           0x00000100
 #define HID_QUIRK_2WHEEL_MOUSE_HACK_ON          0x00000200
 #define HID_QUIRK_MIGHTYMOUSE                   0x00000400
-#define HID_QUIRK_CYMOTION                      0x00000800
-#define HID_QUIRK_POWERBOOK_HAS_FN              0x00001000
-#define HID_QUIRK_POWERBOOK_FN_ON               0x00002000
-#define HID_QUIRK_INVERT_HWHEEL                 0x00004000
-#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD        0x00008000
-#define HID_QUIRK_BAD_RELATIVE_KEYS             0x00010000
-#define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00020000
-#define HID_QUIRK_IGNORE_MOUSE                  0x00040000
-#define HID_QUIRK_SONY_PS3_CONTROLLER           0x00080000
-#define HID_QUIRK_LOGITECH_DESCRIPTOR           0x00100000
-#define HID_QUIRK_DUPLICATE_USAGES              0x00200000
-#define HID_QUIRK_RESET_LEDS                    0x00400000
-#define HID_QUIRK_SWAPPED_MIN_MAX               0x00800000
+#define HID_QUIRK_POWERBOOK_HAS_FN              0x00000800
+#define HID_QUIRK_POWERBOOK_FN_ON               0x00001000
+#define HID_QUIRK_INVERT_HWHEEL                 0x00002000
+#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD        0x00004000
+#define HID_QUIRK_BAD_RELATIVE_KEYS             0x00008000
+#define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
+#define HID_QUIRK_IGNORE_MOUSE                  0x00020000
+#define HID_QUIRK_SONY_PS3_CONTROLLER           0x00040000
+#define HID_QUIRK_DUPLICATE_USAGES              0x00080000
+#define HID_QUIRK_RESET_LEDS                    0x00100000
+#define HID_QUIRK_HIDINPUT                      0x00200000
+#define HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL 0x00400000
+#define HID_QUIRK_LOGITECH_EXPANDED_KEYMAP      0x00800000
+
+/*
+ * Separate quirks for runtime report descriptor fixup
+ */
+
+#define HID_QUIRK_RDESC_CYMOTION                0x00000001
+#define HID_QUIRK_RDESC_LOGITECH                0x00000002
+#define HID_QUIRK_RDESC_SWAPPED_MIN_MAX         0x00000004
+#define HID_QUIRK_RDESC_PETALYNX                0x00000008
 
 /*
  * This is the global environment of the parser. This information is
@@ -511,6 +520,7 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct);
 int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct, const u32 quirks);
 int usbhid_quirks_init(char **quirks_param);
 void usbhid_quirks_exit(void);
+void usbhid_fixup_report_descriptor(const u16, const u16, char *, unsigned, char **);
 
 #ifdef CONFIG_HID_FF
 int hid_ff_init(struct hid_device *hid);