Merge branch 'topic/jack' into for-linus

This commit is contained in:
Takashi Iwai 2009-03-24 00:35:43 +01:00
commit 5b56eec774
4 changed files with 30 additions and 24 deletions

View file

@ -661,6 +661,7 @@ struct input_absinfo {
#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_VIDEOOUT_INSERT 0x08 /* set = inserted */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)