projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c82c8ab
38f1df2
)
Merge branch 'fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Mon, 2 Mar 2009 07:04:10 +0000
(08:04 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 2 Mar 2009 07:04:10 +0000
(08:04 +0100)
Conflicts:
sound/pci/hda/hda_intel.c
1
2
sound/pci/hda/hda_intel.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/pci/hda/hda_intel.c
index 47a5833feb7ade9e61f096d8971cde75ea56255a,5e909e0da04b4b64d18ee9979f38cbaaa853e354..68a128fb487d32dcaadd4a7793060cb59bc87695
---
1
/
sound/pci/hda/hda_intel.c
---
2
/
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),
{}
};