diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 13:22:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 13:22:37 +0100 |
commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /include/sound/jack.h | |
parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'include/sound/jack.h')
-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 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 { |