diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:43 -0400 |
| commit | 5b56eec77498f15317f3ff5ac9101372f400c859 (patch) | |
| tree | 1acfb40ca6a19323a292131aa7fca68ef4ef330b /include/linux/input.h | |
| parent | c2f43981e5dbc92884149aa2234064cc2c340acd (diff) | |
| parent | 662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 (diff) | |
Merge branch 'topic/jack' into for-linus
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 1249a0c20a38..6b28048fc568 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -661,6 +661,7 @@ struct input_absinfo { | |||
| 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_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ |
| 664 | #define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ | ||
| 664 | #define SW_MAX 0x0f | 665 | #define SW_MAX 0x0f |
| 665 | #define SW_CNT (SW_MAX+1) | 666 | #define SW_CNT (SW_MAX+1) |
| 666 | 667 | ||