summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-30 15:17:10 +0200
committerTakashi Iwai <tiwai@suse.de>2017-08-30 15:17:10 +0200
commit3454a476f2f5d6d3cac3b3f907190ffc58c4fd6f (patch)
treed187e798230675e05a2b39c0d9acf87c096daa40 /sound/pci
parentALSA: aoa: Convert to using %pOF instead of full_name (diff)
parentALSA: pcm: Fix power lock unbalance via OSS emulation (diff)
downloadlinux-3454a476f2f5d6d3cac3b3f907190ffc58c4fd6f.tar.xz
linux-3454a476f2f5d6d3cac3b3f907190ffc58c4fd6f.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 8c1289963c80..a81aacf684b2 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -947,6 +947,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),
SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),
+ SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),
SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),
SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),