Merge git://git.infradead.org/hdrcleanup-2.6

[karo-tx-linux.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index b48d9873cbbcee7a961b2ea95720519551dc405d..b32c2b6e53f6947ed7233bfd4013e1c462273d55 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -346,6 +346,8 @@ struct input_absinfo {
 #define KEY_SAVE               234
 #define KEY_DOCUMENTS          235
 
+#define KEY_BATTERY            236
+
 #define KEY_UNKNOWN            240
 
 #define BTN_MISC               0x100
@@ -578,14 +580,9 @@ struct input_absinfo {
  * Switch events
  */
 
-#define SW_0                   0x00
-#define SW_1                   0x01
-#define SW_2                   0x02
-#define SW_3                   0x03
-#define SW_4                   0x04
-#define SW_5                   0x05
-#define SW_6                   0x06
-#define SW_7                   0x07
+#define SW_LID                 0x00  /* set = lid shut */
+#define SW_TABLET_MODE         0x01  /* set = tablet mode */
+#define SW_HEADPHONE_INSERT    0x02  /* set = inserted */
 #define SW_MAX                 0x0f
 
 /*