Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / input / hid.h

diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h
index 8aa9ec08e8ab6ffa7315c00ea1d3a4e2ea0a6c9a..76ad68d9edfd04d645788f3eeaa3476a1093a240 100644 (file)
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@ -260,7 +260,8 @@ struct hid_item {
 #define HID_QUIRK_POWERBOOK_HAS_FN             0x00001000
 #define HID_QUIRK_POWERBOOK_FN_ON              0x00002000
 #define HID_QUIRK_INVERT_HWHEEL                        0x00004000
-#define HID_QUIRK_BAD_RELATIVE_KEYS            0x00008000
+#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD       0x00008000
+#define HID_QUIRK_BAD_RELATIVE_KEYS            0x00010000
 
 /*
  * This is the global environment of the parser. This information is
@@ -385,6 +386,7 @@ struct hid_control_fifo {
 #define HID_IN_RUNNING         3
 #define HID_RESET_PENDING      4
 #define HID_SUSPENDED          5
+#define HID_CLEAR_HALT         6
 
 struct hid_input {
        struct list_head list;