diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-03-02 08:06:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-02 08:06:11 +0100 |
| commit | 4c4531d64dd0442813c7307b860bf40a2aec51bc (patch) | |
| tree | 6e725e746c93263aed8c5146944bd0634564183d /sound | |
| parent | ALSA: hda - Don't create a beep control for digital-only ALC268 (diff) | |
| download | linux-dev-4c4531d64dd0442813c7307b860bf40a2aec51bc.tar.xz linux-dev-4c4531d64dd0442813c7307b860bf40a2aec51bc.zip | |
ALSA: hda - Remove Toshiba probe_mask quirk
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 68a128fb487d..47a5833feb7a 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -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), {} |