diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 10:14:41 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 10:14:41 +0300 |
| commit | 1618a3281b90c43ccc85b58699508b9864defc8c (patch) | |
| tree | 21990e42077a1d1cafe628af01ad4510ddf071c4 /sound/pci/hda/patch_realtek.c | |
| parent | cc95948972576c3efa43c9ed05b4a265805a4c54 (diff) | |
| parent | cc374c477c9bf95f409fed16426856d86a97394f (diff) | |
| download | linux-1618a3281b90c43ccc85b58699508b9864defc8c.tar.xz | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index abddabc1efa8..5c9bb066a764 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7224,6 +7224,7 @@ static int patch_alc882(struct hda_codec *codec) case 0x106b3e00: /* iMac 24 Aluminium */ board_config = ALC885_IMAC24; break; + case 0x106b00a0: /* MacBookPro3,1 - Another revision */ case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ case 0x106b00a4: /* MacbookPro4,1 */ case 0x106b2c00: /* Macbook Pro rev3 */ @@ -8679,6 +8680,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { 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), /* default Acer */ SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), |