diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-01-26 11:31:34 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-01-26 11:31:41 +0300 |
commit | 9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4 (patch) | |
tree | 986201af09ea4cd734ac5afa4a069cb9e56b78e9 /sound/pci/hda/patch_conexant.c | |
parent | 5396c4bd9fd8429050f6191663b6c491e6402da2 (diff) | |
parent | b81cbf7abfc94878a3c6f0789f2185ee55b1cc21 (diff) | |
download | linux-9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4.tar.xz |
Merge branch 'for-linus' into for-next
Resolve conflicts and correct the hex numbers, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 9853e00a0816..396b5503038a 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -922,6 +922,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410), + SND_PCI_QUIRK(0x17aa, 0x21d2, "Lenovo T420s", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo IdeaPad Z560", CXT_FIXUP_MUTE_LED_EAPD), |