diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:29 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:29 -0500 |
| commit | a8022697811c3f2271df5ec14fa6f518b731b46a (patch) | |
| tree | d94522dec3c3008d6e204ac5266888d5997b2368 /include/sound | |
| parent | a65056205cdf7efb96fb2558e4f1ec6bae2582ed (diff) | |
| parent | cdc693643271b2e6a693cf8f6afb258cce01f058 (diff) | |
Merge branch 'topic/jack-mechanical' into to-push
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/jack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 7cb25f4b50bb..2e0315cdd0d6 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h | |||
| @@ -36,6 +36,7 @@ enum snd_jack_types { | |||
| 36 | SND_JACK_MICROPHONE = 0x0002, | 36 | SND_JACK_MICROPHONE = 0x0002, |
| 37 | SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE, | 37 | SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE, |
| 38 | SND_JACK_LINEOUT = 0x0004, | 38 | SND_JACK_LINEOUT = 0x0004, |
| 39 | SND_JACK_MECHANICAL = 0x0008, /* If detected separately */ | ||
| 39 | }; | 40 | }; |
| 40 | 41 | ||
| 41 | struct snd_jack { | 42 | struct snd_jack { |