summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-21 08:27:04 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-21 08:27:04 +0100
commit75a287d9a35a825cb758d2f8d8df93d41f9f8e3e (patch)
tree7aacf881315a16695e35ca810434e42666d26a55 /Documentation/sound
parent1725b82a6e2721612a3572d0336f51f1f1c3cf54 (diff)
parent3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0 (diff)
downloadop-kernel-dev-75a287d9a35a825cb758d2f8d8df93d41f9f8e3e.zip
op-kernel-dev-75a287d9a35a825cb758d2f8d8df93d41f9f8e3e.tar.gz
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.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index e55081f..1b7e36a 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1078,6 +1078,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
ref Reference board
dell-m4-1 Dell desktops
dell-m4-2 Dell desktops
+ dell-m4-3 Dell desktops
STAC92HD73*
ref Reference board
OpenPOWER on IntegriCloud