diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-09 15:21:51 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-09 15:21:51 +0100 |
| commit | 33dbe6114047496a5b6fee0941c52dad41250043 (patch) | |
| tree | 74f84bc9658f4e72a22e89429aedbe49fdc13db4 /include | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| parent | 662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 (diff) | |
Merge branch 'topic/jack' into topic/docbook-fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input.h | 1 | ||||
| -rw-r--r-- | include/sound/jack.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 9a6355f74db..adc13322d1d 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -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) diff --git a/include/sound/jack.h b/include/sound/jack.h index 2e0315cdd0d..6b013c6f6a0 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -30,6 +30,9 @@ struct input_dev; /** * Jack types which can be reported. These values are used as a * bitmask. + * + * Note that this must be kept in sync with the lookup table in + * sound/core/jack.c. */ enum snd_jack_types { SND_JACK_HEADPHONE = 0x0001, @@ -37,6 +40,8 @@ enum snd_jack_types { SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE, SND_JACK_LINEOUT = 0x0004, SND_JACK_MECHANICAL = 0x0008, /* If detected separately */ + SND_JACK_VIDEOOUT = 0x0010, + SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT, }; struct snd_jack { |