Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / input / hid.h

diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h
index 9b50effef75817af9c00b3d459bf481c1c5e1d9d..2a9bf07944c03b94adfc62ed5aa989c197fb04fe 100644 (file)
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@ -260,6 +260,7 @@ 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_POWERBOOK_ISO_KEYBOARD       0x00008000
 
 /*
  * This is the global environment of the parser. This information is
@@ -384,6 +385,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;