summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-05 13:16:56 +0400
committerTakashi Iwai <tiwai@suse.de>2010-08-05 13:16:56 +0400
commit2603798070a80d76e7e6d2992ba4ec74addcec90 (patch)
tree7a1cdc33bd9bbf3807db239205de02d6beb58e30 /Documentation
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
parentfc091769a5aa65c045bfbda149c424ba33d0abbb (diff)
downloadlinux-2603798070a80d76e7e6d2992ba4ec74addcec90.tar.xz
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 1d38b0dfba95..03771d7c5dd7 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -114,6 +114,11 @@ ALC662/663/272
samsung-nc10 Samsung NC10 mini notebook
auto auto-config reading BIOS (default)
+ALC680
+======
+ base Base model (ASUS NX90)
+ auto auto-config reading BIOS (default)
+
ALC882/883/885/888/889
======================
3stack-dig 3-jack with SPDIF I/O
@@ -282,6 +287,7 @@ Conexant 5051
hp HP Spartan laptop
hp-dv6736 HP dv6736
hp-f700 HP Compaq Presario F700
+ ideapad Lenovo IdeaPad laptop
lenovo-x200 Lenovo X200 laptop
toshiba Toshiba Satellite M300