summaryrefslogtreecommitdiff
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-06-17 11:16:16 +0200
committerTakashi Iwai <tiwai@suse.de>2013-06-17 11:16:16 +0200
commita8b083a24b987eaf79f2de12a86648001f0f4865 (patch)
treebb049f802d5032503a417c11ed8fc4a8edc37abe /Documentation/sound
parentda177dd0259eb74061a3a1f6ab037f5080c2a504 (diff)
parente32aa85ab49203104019025eba83f03f88a3a0e3 (diff)
Merge branch 'for-linus' into for-next
* for-linus: ALSA: hda - Add models for Dell headset jacks
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index bb8b0dc532b8..77d68e23b247 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -29,6 +29,8 @@ ALC269/270/275/276/280/282
alc271-dmic Enable ALC271X digital mic workaround
inv-dmic Inverted internal mic workaround
lenovo-dock Enables docking station I/O for some Lenovos
+ dell-headset-multi Headset jack, which can also be used as mic-in
+ dell-headset-dock Headset jack (without mic-in), and also dock I/O
ALC662/663/272
==============
@@ -42,6 +44,7 @@ ALC662/663/272
asus-mode7 ASUS
asus-mode8 ASUS
inv-dmic Inverted internal mic workaround
+ dell-headset-multi Headset jack, which can also be used as mic-in
ALC680
======