Pull sony into release branch

[linux-2.6] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 829690d8071edd1420ad01196d32f89eb8acb306..d26b08f461f2eeb2986f0ad1a7c30f62c61fdb5e 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -265,6 +265,8 @@ struct hid_item {
 #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
 
 /*
  * This is the global environment of the parser. This information is