From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 2 Mar 2009 07:04:10 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b31b43e9fb49b71ae753bebc185fe55797ba20c6;p=linux-2.6-omap-h63xx.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/hda_intel.c
---

b31b43e9fb49b71ae753bebc185fe55797ba20c6
diff --cc sound/pci/hda/hda_intel.c
index 47a5833feb7,5e909e0da04..68a128fb487
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -2095,8 -2095,8 +2095,10 @@@ static struct snd_pci_quirk probe_mask_
  	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),
+ 	/* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */
+ 	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03),
 +	/* forced codec slots */
 +	SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103),
  	{}
  };