diff options
author | Takashi Iwai | 2018-05-15 07:30:23 +0200 |
---|---|---|
committer | Takashi Iwai | 2018-05-15 07:30:23 +0200 |
commit | 8def12d9cd45b6abad87c5dc5a88a18c739762be (patch) | |
tree | 232020665442fb2c8bd55f4878c1735535dfd8a7 /sound/pci/hda/patch_realtek.c | |
parent | ALSA: hda/ca0132: fix array_size.cocci warnings (diff) | |
parent | ALSA: usb-audio: Use Class Specific EP for UAC3 devices. (diff) | |
download | kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.tar.gz kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.tar.xz kernel-qcow2-linux-8def12d9cd45b6abad87c5dc5a88a18c739762be.zip |
Merge branch 'for-linus' into for-next
Back-merge of UAC3 fixes for applying further enhancements.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 04103099c230..3af93841abe1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2363,6 +2363,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD), SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530), @@ -3832,7 +3833,7 @@ static void alc280_fixup_hp_gpio4(struct hda_codec *codec, } } -#if IS_REACHABLE(INPUT) +#if IS_REACHABLE(CONFIG_INPUT) static void gpio2_mic_hotkey_event(struct hda_codec *codec, struct hda_jack_callback *event) { |