diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:29 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:29 -0500 |
| commit | a8022697811c3f2271df5ec14fa6f518b731b46a (patch) | |
| tree | d94522dec3c3008d6e204ac5266888d5997b2368 /include/linux/input.h | |
| parent | a65056205cdf7efb96fb2558e4f1ec6bae2582ed (diff) | |
| parent | cdc693643271b2e6a693cf8f6afb258cce01f058 (diff) | |
Merge branch 'topic/jack-mechanical' into to-push
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 1a958cd90ce9..9a6355f74db2 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -660,6 +660,7 @@ struct input_absinfo { | |||
| 660 | #define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ | 660 | #define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ |
| 661 | #define SW_DOCK 0x05 /* set = plugged into dock */ | 661 | #define SW_DOCK 0x05 /* set = plugged into dock */ |
| 662 | #define SW_LINEOUT_INSERT 0x06 /* set = inserted */ | 662 | #define SW_LINEOUT_INSERT 0x06 /* set = inserted */ |
| 663 | #define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ | ||
| 663 | #define SW_MAX 0x0f | 664 | #define SW_MAX 0x0f |
| 664 | #define SW_CNT (SW_MAX+1) | 665 | #define SW_CNT (SW_MAX+1) |
| 665 | 666 | ||