From: Takashi Iwai Date: Mon, 23 Feb 2009 07:14:41 +0000 (+0100) Subject: Merge branch 'fix/hda' into topic/hda X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1618a3281b90c43ccc85b58699508b9864defc8c;p=linux-2.6-omap-h63xx.git Merge branch 'fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_realtek.c --- 1618a3281b90c43ccc85b58699508b9864defc8c diff --cc sound/pci/hda/patch_realtek.c index abddabc1efa,a680be0d453..5c9bb066a76 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@@ -8675,12 -8468,11 +8676,14 @@@ static struct snd_pci_quirk alc883_cfg_ ALC888_ACER_ASPIRE_4930G), SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G", ALC888_ACER_ASPIRE_4930G), + SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC883_AUTO), + SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO), SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", ALC888_ACER_ASPIRE_4930G), + SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G", + ALC888_ACER_ASPIRE_4930G), - SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */ + /* default Acer */ + SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),