Merge branch 'topic/jack-mechanical' into to-push

[sfrench/cifs-2.6.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 5341e8251f8cb451243cd526f8dd34232052e055..9a6355f74db25b28233cb3d9d8765d7aec13632e 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -659,6 +659,8 @@ struct input_absinfo {
 #define SW_RADIO               SW_RFKILL_ALL   /* deprecated */
 #define SW_MICROPHONE_INSERT   0x04  /* set = inserted */
 #define SW_DOCK                        0x05  /* set = plugged into dock */
+#define SW_LINEOUT_INSERT      0x06  /* set = inserted */
+#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
 #define SW_MAX                 0x0f
 #define SW_CNT                 (SW_MAX+1)