diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-02 08:04:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-02 08:04:10 +0100 |
| commit | b31b43e9fb49b71ae753bebc185fe55797ba20c6 (patch) | |
| tree | 702b451d43f50e348b4e5064ed11a24b48eceb0b /sound | |
| parent | c82c8abdeef53eb0bb0504becb4e91bbccceaee8 (diff) | |
| parent | 38f1df27e3191d76e983cb9c6b4392582fd32fda (diff) | |
| download | op-kernel-dev-b31b43e9fb49b71ae753bebc185fe55797ba20c6.zip op-kernel-dev-b31b43e9fb49b71ae753bebc185fe55797ba20c6.tar.gz | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/hda_intel.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 47a5833..68a128f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2095,6 +2095,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), + /* 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), {} |
