Skip to content

L
linux-davinci
Commit 1618a328 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/patch_realtek.c
parents cc959489 cc374c47
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
sound/pci/hda/patch_realtek.c
View file @ 1618a328
...@@ -7224,6 +7224,7 @@ static int patch_alc882(struct hda_codec *codec) ...@@ -7224,6 +7224,7 @@ static int patch_alc882(struct hda_codec *codec)
case 0x106b3e00: /* iMac 24 Aluminium */ case 0x106b3e00: /* iMac 24 Aluminium */
board_config = ALC885_IMAC24; board_config = ALC885_IMAC24;
break; break;
case 0x106b00a0: /* MacBookPro3,1 - Another revision */
case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */
case 0x106b00a4: /* MacbookPro4,1 */ case 0x106b00a4: /* MacbookPro4,1 */
case 0x106b2c00: /* Macbook Pro rev3 */ case 0x106b2c00: /* Macbook Pro rev3 */
...@@ -8679,6 +8680,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { ...@@ -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, 0x0158, "Acer AX1700-U3700A", ALC883_AUTO),
SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
ALC888_ACER_ASPIRE_4930G), ALC888_ACER_ASPIRE_4930G),
SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",
ALC888_ACER_ASPIRE_4930G),
/* default Acer */ /* default Acer */
SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER),
SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment