Merge branch 'topic/hda' into to-push

2008-12-25 11:40:28 +01:00
parent 313769d9ed 7645c4bfbb
commit a65056205c
30 changed files with 5773 additions and 2361 deletions
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -35,6 +35,7 @@ enum snd_jack_types {
 	SND_JACK_HEADPHONE	= 0x0001,
 	SND_JACK_MICROPHONE	= 0x0002,
 	SND_JACK_HEADSET	= SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
+	SND_JACK_LINEOUT	= 0x0004,
 };

 struct snd_jack {