diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-16 12:47:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-16 12:48:21 +0200 |
| commit | 0b2d71175990629f11189f5df98cc0c26ae61993 (patch) | |
| tree | 838029b09d5dac48768b54001fe74e476cddd344 | |
| parent | cf8a471909dd6a0df3efe2586cab5323184b4a7d (diff) | |
| parent | 145c0e914d2cd0cf829b8c4cbe24736b3ee81a91 (diff) | |
Merge branch 'for-linus' into for-next
Yet another non-trivial conflicts for HDA legacy stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/mips/Kconfig | 2 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig index d2f615ab177a..2153d31fb663 100644 --- a/sound/mips/Kconfig +++ b/sound/mips/Kconfig @@ -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. diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 961300d92983..431a20b17df4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -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), |