Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b2d7117 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Yet another non-trivial conflicts for HDA legacy stuff.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents cf8a4719 145c0e91

sound/mips/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ if SND_MIPS 
config SND_SGI_O2

	tristate "SGI O2 Audio"

	depends on SGI_IP32

	select SND_PCM

        help

                Sound support for the SGI O2 Workstation. 



config SND_SGI_HAL2

        tristate "SGI HAL2 Audio"

        depends on SGI_HAS_HAL2

	select SND_PCM

        help

                Sound support for the SGI Indy and Indigo2 Workstation.

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -5089,6 +5089,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, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0665, "Dell XPS 13", ALC292_FIXUP_DELL_E7X),

	SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),