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

2008-12-25 11:40:29 +01:00
parent a65056205c cdc6936432
commit a802269781
3 changed files with 8 additions and 0 deletions
--- a/include/linux/input.h
+++ b/include/linux/input.h
@ -660,6 +660,7 @@ struct input_absinfo {
 #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)