diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-07-17 22:26:54 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-07-17 22:27:03 +0200 |
commit | ed6b83d2d190463c46a5e4a5b04c49d885c56439 (patch) | |
tree | 71a6fa7d43f91ad7256e963c18bec0e9e13f844e /sound/pci/hda/patch_conexant.c | |
parent | 7373c2a99abf2b11b5e8a226071331c0176253ff (diff) | |
parent | 39675f7a7c7e7702f7d5341f1e0d01db746543a0 (diff) | |
download | linux-ed6b83d2d190463c46a5e4a5b04c49d885c56439.tar.gz |
Merge branch 'for-linus' into for-next
Back-merge for further cleanup / improvements on rawmidi and HD-audio
stuff.
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 8b48352689b4..08e32be4cc5c 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -927,6 +927,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC), SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO), SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO), + SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO), SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE), |