diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:43 +0100 |
| commit | 5b56eec77498f15317f3ff5ac9101372f400c859 (patch) | |
| tree | 1acfb40ca6a19323a292131aa7fca68ef4ef330b /include/sound | |
| parent | c2f43981e5dbc92884149aa2234064cc2c340acd (diff) | |
| parent | 662c319ae4b4fb60001816dfe1dde5fdfc7a2af9 (diff) | |
| download | blackbird-op-linux-5b56eec77498f15317f3ff5ac9101372f400c859.tar.gz blackbird-op-linux-5b56eec77498f15317f3ff5ac9101372f400c859.zip | |
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/jack.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 2e0315cdd0d6..6b013c6f6a04 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 { |
