summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-25 15:20:57 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-25 15:20:57 +0100
commiteefe93b9957e6f14780b7d37aeda0f27f341953d (patch)
tree4b73293616abc911ead9d559a58b897885d7ad86 /Documentation/sound
parentee09543c866559e1ffb4f5c38533f2bedd725acd (diff)
parent661cd8fb5210af78f0763071642e0764a10389a6 (diff)
downloadblackbird-op-linux-eefe93b9957e6f14780b7d37aeda0f27f341953d.tar.gz
blackbird-op-linux-eefe93b9957e6f14780b7d37aeda0f27f341953d.zip
Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 93624e7b4f04..773a6201aede 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1083,7 +1083,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
STAC92HD73*
ref Reference board
- dell-m6 Dell desktops
+ dell-m6-amic Dell desktops/laptops with analog mics
+ dell-m6-dmic Dell desktops/laptops with digital mics
+ dell-m6 Dell desktops/laptops with both type of mics
STAC9872
vaio Setup for VAIO FE550G/SZ110
OpenPOWER on IntegriCloud