diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-22 15:44:45 +0200 |
| commit | 241bc82e62b28fdb7223b85180fd814f4963c971 (patch) | |
| tree | f0d1a3889fd027e017faa37fc34bffe2fa038c41 /sound/pci/hda | |
| parent | ALSA: firewire-motu: add support for MOTU Audio Express (diff) | |
| parent | ALSA: core: Fix unexpected error at replacing user TLV (diff) | |
| download | linux-241bc82e62b28fdb7223b85180fd814f4963c971.tar.xz linux-241bc82e62b28fdb7223b85180fd814f4963c971.zip | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/core/control.c
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a91a9ef00c40..217bb582aff1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6647,7 +6647,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { SND_HDA_PIN_QUIRK(0x10ec0299, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, {0x12, 0xb7a60130}, - {0x13, 0xb8a61140}, {0x17, 0x90170110}), {} }; |