diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-16 11:38:43 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-16 11:38:43 -0400 |
commit | 7998d90a143d0f8fbbb45282d5900a844de9bc16 (patch) | |
tree | 7d868249eb6c17fb4ef505c00ec547f87be074d6 /sound/pci | |
parent | 3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a (diff) | |
parent | e46b0c8c08cd97eb8f9a523986908add3ece0cc6 (diff) |
Merge branch 'topic/hda' into for-linus
* topic/hda:
ALSA: hda - Add quirk for Acer Aspire 6935G
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 337d2a59c67e..d22b26068014 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -9014,6 +9014,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
9014 | ALC888_ACER_ASPIRE_4930G), | 9014 | ALC888_ACER_ASPIRE_4930G), |
9015 | SND_PCI_QUIRK(0x1025, 0x0145, "Acer Aspire 8930G", | 9015 | SND_PCI_QUIRK(0x1025, 0x0145, "Acer Aspire 8930G", |
9016 | ALC888_ACER_ASPIRE_8930G), | 9016 | ALC888_ACER_ASPIRE_8930G), |
9017 | SND_PCI_QUIRK(0x1025, 0x0146, "Acer Aspire 6935G", | ||
9018 | ALC888_ACER_ASPIRE_8930G), | ||
9017 | SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC883_AUTO), | 9019 | SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC883_AUTO), |
9018 | SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO), | 9020 | SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO), |
9019 | SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", | 9021 | SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", |