1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index d26b08f461f2..37076b116ed0 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -6,7 +6,7 @@
  *
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2001 Vojtech Pavlik
- *  Copyright (c) 2006 Jiri Kosina
+ *  Copyright (c) 2006-2007 Jiri Kosina
  */
 
 /*
@@ -247,6 +247,11 @@ struct hid_item {
  * HID device quirks.
  */
 
+/* 
+ * Increase this if you need to configure more HID quirks at module load time
+ */
+#define MAX_USBHID_BOOT_QUIRKS 4
+
 #define HID_QUIRK_INVERT                        0x00000001
 #define HID_QUIRK_NOTOUCH                       0x00000002
 #define HID_QUIRK_IGNORE                        0x00000004
@@ -267,6 +272,9 @@ struct hid_item {
 #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
 
 /*
  * This is the global environment of the parser. This information is
@@ -292,7 +300,7 @@ struct hid_global {
  */
 
 #define HID_MAX_DESCRIPTOR_SIZE         4096
-#define HID_MAX_USAGES                  1024
+#define HID_MAX_USAGES                  8192
 #define HID_DEFAULT_NUM_COLLECTIONS     16
 
 struct hid_local {
@@ -492,6 +500,12 @@ void hid_output_report(struct hid_report *report, __u8 *data);
 void hid_free_device(struct hid_device *device);
 struct hid_device *hid_parse_report(__u8 *start, unsigned size);
 
+/* HID quirks API */
+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);
+
 #ifdef CONFIG_HID_FF
 int hid_ff_init(struct hid_device *hid);