diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:35 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:35 +0200 |
commit | f686c74cc3e78349d16d46fc72807354574b1516 (patch) | |
tree | a6f9d06629184a0044feaa5563a71709a0213ee5 /Documentation/sound | |
parent | 7ec298dfef00e2c8effe8658011e03d86911b0bf (diff) | |
parent | 50e3bbf9898840eead86f90a43b3625a2b2f4112 (diff) | |
download | linux-f686c74cc3e78349d16d46fc72807354574b1516.tar.gz linux-f686c74cc3e78349d16d46fc72807354574b1516.tar.bz2 linux-f686c74cc3e78349d16d46fc72807354574b1516.zip |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 0caf77e59be4..d70c93bdcadf 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -94,7 +94,7 @@ ALC662/663/272 3stack-dig 3-stack (2-channel) with SPDIF 3stack-6ch 3-stack (6-channel) 3stack-6ch-dig 3-stack (6-channel) with SPDIF - 6stack-dig 6-stack with SPDIF + 5stack-dig 5-stack with SPDIF lenovo-101e Lenovo laptop eeepc-p701 ASUS Eeepc P701 eeepc-ep20 ASUS Eeepc EP20 |