aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-13 08:37:19 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-13 08:37:19 +0100
commitc400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (patch)
treeebb44130d6925943c3573807863ada4c93f0bd49 /Documentation/sound
parente38302f78284e3e80ffc2eef54001fce7d183bd4 (diff)
parent80c678526d7da73bde4d46a4622449c2b3c88409 (diff)
downloadkernel_samsung_aries-c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38.zip
kernel_samsung_aries-c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38.tar.gz
kernel_samsung_aries-c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38.tar.bz2
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 37c6aad..16ae430 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -149,7 +149,6 @@ ALC882/883/885/888/889
acer-aspire-7730g Acer Aspire 7730G
acer-aspire-8930g Acer Aspire 8930G
medion Medion Laptops
- medion-md2 Medion MD2
targa-dig Targa/MSI
targa-2ch-dig Targa/MSI with 2-channel
targa-8ch-dig Targa/MSI with 8-channel (MSI GX620)