summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-06-17 11:16:16 +0200
committerTakashi Iwai <tiwai@suse.de>2013-06-17 11:16:16 +0200
commita8b083a24b987eaf79f2de12a86648001f0f4865 (patch)
treebb049f802d5032503a417c11ed8fc4a8edc37abe /sound/pci
parentda177dd0259eb74061a3a1f6ab037f5080c2a504 (diff)
parente32aa85ab49203104019025eba83f03f88a3a0e3 (diff)
downloadlinux-a8b083a24b987eaf79f2de12a86648001f0f4865.tar.bz2
Merge branch 'for-linus' into for-next
* for-linus: ALSA: hda - Add models for Dell headset jacks
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f5b1e51bafb6..ad087ea32f3a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3610,6 +3610,8 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
{.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},
{.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
{.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
+ {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
+ {.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},
{}
};
@@ -4289,6 +4291,7 @@ static const struct hda_model_fixup alc662_fixup_models[] = {
{.id = ALC662_FIXUP_ASUS_MODE7, .name = "asus-mode7"},
{.id = ALC662_FIXUP_ASUS_MODE8, .name = "asus-mode8"},
{.id = ALC662_FIXUP_INV_DMIC, .name = "inv-dmic"},
+ {.id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
{}
};