Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

1 files changed, 4 insertions, 5 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index d150c57e5f0a..a5802c9c81a4 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -373,6 +373,8 @@ struct input_absinfo {
 
 #define KEY_WIMAX               246
 
+/* Range 248 - 255 is reserved for special needs of AT keyboard driver */
+
 #define BTN_MISC                0x100
 #define BTN_0                   0x100
 #define BTN_1                   0x101
@@ -640,6 +642,8 @@ struct input_absinfo {
 #define SW_RFKILL_ALL           0x03  /* rfkill master switch, type "any"
                                          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)
 
@@ -1215,11 +1219,6 @@ struct input_handle {
         struct list_head        h_node;
 };
 
-#define to_dev(n) container_of(n, struct input_dev, node)
-#define to_handler(n) container_of(n, struct input_handler, node)
-#define to_handle(n) container_of(n, struct input_handle, d_node)
-#define to_handle_h(n) container_of(n, struct input_handle, h_node)
-
 struct input_dev *input_allocate_device(void);
 void input_free_device(struct input_dev *dev);