diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:28 -0500 |
| commit | a65056205cdf7efb96fb2558e4f1ec6bae2582ed (patch) | |
| tree | 22a5fa35464f26183e34aa4210fa6c145f24ddf3 /include/sound | |
| parent | 313769d9edb1bbd59d2e94f5069950eecfe6fa44 (diff) | |
| parent | 7645c4bfbb36f357f03815f5729c46ce8d89f008 (diff) | |
Merge branch 'topic/hda' 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 b1b2b8b59adb..7cb25f4b50bb 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h | |||
| @@ -35,6 +35,7 @@ enum snd_jack_types { | |||
| 35 | SND_JACK_HEADPHONE = 0x0001, | 35 | SND_JACK_HEADPHONE = 0x0001, |
| 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 | }; | 39 | }; |
| 39 | 40 | ||
| 40 | struct snd_jack { | 41 | struct snd_jack { |