From 49568e0beb8ded89dc4d8ea21cdd4ef988389024 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 13 Feb 2009 08:18:48 +0100 Subject: [PATCH] --- yaml --- r: 133043 b: refs/heads/master c: 20db7cb0acd0ba5a3b12f686148d670294a69366 h: refs/heads/master i: 133041: bd33e2deb02c8837408056477b2fe477ce3d920e 133039: 20b4cb090da24776496b162ef56e453d847b76a2 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_intel.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 41187218f4ef..bdc3579017d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1eaaeec11982c6b529d4255987fdf507a5fa69e +refs/heads/master: 20db7cb0acd0ba5a3b12f686148d670294a69366 diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c index 19886e4bc829..e853e4a8bde9 100644 --- a/trunk/sound/pci/hda/hda_intel.c +++ b/trunk/sound/pci/hda/hda_intel.c @@ -2098,6 +2098,8 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = { SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01), /* including bogus ALC268 in slot#2 that conflicts with ALC888 */ SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01), + /* forced codec slots */ + SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103), {} };