]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: hda - Remove Toshiba probe_mask quirk
authorTakashi Iwai <tiwai@suse.de>
Mon, 2 Mar 2009 07:06:11 +0000 (08:06 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 2 Mar 2009 07:06:11 +0000 (08:06 +0100)
Revert the Toshiba probe_mask quirk for 2.6.29 kernel
(commit 38f1df27e3191d76e983cb9c6b4392582fd32fda).
In the current tree, the digital-only codec is handled properly so
no codec conflict should occur.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c

index 68a128fb487d32dcaadd4a7793060cb59bc87695..47a5833feb7ade9e61f096d8971cde75ea56255a 100644 (file)
@@ -2095,8 +2095,6 @@ 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),
-       /* 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),
        {}