Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --git a/include/linux/input.h b/include/linux/input.h
index 1be28cbbc57bcdfa0746377df47a1f5d33de8858..a5802c9c81a47831996a93cffc00fcb7190d4089 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -536,8 +536,8 @@ struct input_absinfo {
 
 #define KEY_FRAMEBACK          0x1b4   /* Consumer - transport controls */
 #define KEY_FRAMEFORWARD       0x1b5
-
 #define KEY_CONTEXT_MENU       0x1b6   /* GenDesc - system context menu */
+#define KEY_MEDIA_REPEAT       0x1b7   /* Consumer - transport control */
 
 #define KEY_DEL_EOL            0x1c0
 #define KEY_DEL_EOS            0x1c1
@@ -643,6 +643,7 @@ struct input_absinfo {
                                         set = radio enabled */
 #define SW_RADIO               SW_RFKILL_ALL   /* deprecated */
 #define SW_MICROPHONE_INSERT   0x04  /* set = inserted */
+#define SW_DOCK                        0x05  /* set = plugged into dock */
 #define SW_MAX                 0x0f
 #define SW_CNT                 (SW_MAX+1)