2 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 0ac2b5260b26..55e51f9f76cb 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -276,6 +276,7 @@ struct hid_item {
 #define HID_QUIRK_HIDINPUT                      0x00200000
 #define HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL 0x00400000
 #define HID_QUIRK_LOGITECH_EXPANDED_KEYMAP      0x00800000
+#define HID_QUIRK_IGNORE_HIDINPUT               0x01000000
 
 /*
  * Separate quirks for runtime report descriptor fixup
@@ -285,6 +286,7 @@ struct hid_item {
 #define HID_QUIRK_RDESC_LOGITECH                0x00000002
 #define HID_QUIRK_RDESC_SWAPPED_MIN_MAX         0x00000004
 #define HID_QUIRK_RDESC_PETALYNX                0x00000008
+#define HID_QUIRK_RDESC_MACBOOK_JIS             0x00000010
 
 /*
  * This is the global environment of the parser. This information is
diff --git a/include/linux/input.h b/include/linux/input.h
index 6eb3aead7f1d..52d1bd434a50 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -523,6 +523,8 @@ struct input_absinfo {
 #define KEY_ADDRESSBOOK         0x1ad   /* AL Contacts/Address Book */
 #define KEY_MESSENGER           0x1ae   /* AL Instant Messaging */
 #define KEY_DISPLAYTOGGLE       0x1af   /* Turn display (LCD) on and off */
+#define KEY_SPELLCHECK          0x1b0   /* AL Spell Check */
+#define KEY_LOGOFF              0x1b1   /* AL Logoff */
 
 #define KEY_DEL_EOL             0x1c0
 #define KEY_DEL_EOS             0x1c1