]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'topic/huawei-leds' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 13 Dec 2018 08:26:19 +0000 (09:26 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 13 Dec 2018 08:26:45 +0000 (09:26 +0100)
Pull Huawei LEDS and hotkey support.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/pci/hda/patch_realtek.c

index dfaa6d3d632136edc50dfaed040531f1826b6e24,9766fd249bdf89998b7149ac23711d439d37984f..129ebd8578926e5b8e4aef297fbf41244fe11e84
@@@ -5572,15 -5490,9 +5572,16 @@@ enum 
        ALC298_FIXUP_TPT470_DOCK,
        ALC255_FIXUP_DUMMY_LINEOUT_VERB,
        ALC255_FIXUP_DELL_HEADSET_MIC,
+       ALC256_FIXUP_HUAWEI_MBXP_PINS,
        ALC295_FIXUP_HP_X360,
        ALC221_FIXUP_HP_HEADSET_MIC,
 +      ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,
 +      ALC295_FIXUP_HP_AUTO_MUTE,
 +      ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
 +      ALC294_FIXUP_ASUS_MIC,
 +      ALC294_FIXUP_ASUS_HEADSET_MIC,
 +      ALC294_FIXUP_ASUS_SPK,
 +      ALC225_FIXUP_HEADSET_JACK,
  };
  
  static const struct hda_fixup alc269_fixups[] = {