summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-15 11:14:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-15 11:14:07 -0700
commit218a8c2b572d9181ac0c6342dcaa72574f13ae35 (patch)
tree2330d7b98b5eb2f14fe4eef80e5701e9d8a25c84 /Documentation
parent919f797a4c9c22ff5ec059744dba364dc600ece2 (diff)
parent7d7eb9ea314e992413620610b4d09c9cd5fa8959 (diff)
downloadop-kernel-dev-218a8c2b572d9181ac0c6342dcaa72574f13ae35.zip
op-kernel-dev-218a8c2b572d9181ac0c6342dcaa72574f13ae35.tar.gz
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull another round of sound fixes from Takashi Iwai: "A few regression fixes for Realtek HD-audio codecs, mainly specific to some laptop models." * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda/realtek - Fix mem leak (and rid us of trailing whitespace). ALSA: hda/realtek - Add quirk for Mac Pro 5,1 machines ALSA: hda/realtek - Add a fixup entry for Acer Aspire 8940G ALSA: hda/realtek - Fix GPIO1 setup for Acer Aspire 4930 & co ALSA: hda/realtek - Add a few ALC882 model strings back
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index d97d992..03f7897 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -43,7 +43,9 @@ ALC680
ALC882/883/885/888/889
======================
- N/A
+ acer-aspire-4930g Acer Aspire 4930G/5930G/6530G/6930G/7730G
+ acer-aspire-8930g Acer Aspire 8330G/6935G
+ acer-aspire Acer Aspire others
ALC861/660
==========
OpenPOWER on IntegriCloud