diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
commit | 4b5a5096bb834102b2e821f5f34274f041862d67 (patch) | |
tree | fe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /sound/pci | |
parent | ALSA: usb-audio: Add a quirk for Plantronics Gamecom 780 (diff) | |
parent | ALSA: hiface: Fix typo in 352800 rate definition (diff) | |
download | linux-4b5a5096bb834102b2e821f5f34274f041862d67.tar.xz linux-4b5a5096bb834102b2e821f5f34274f041862d67.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a84e0493499d..16c0caa7f014 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4340,6 +4340,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK), SND_PCI_QUIRK(0x1028, 0x063e, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0640, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), |