git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
6e0446c
6dd7dc7
)
Merge branch 'fix/hda' into for-linus
author
Takashi Iwai
<tiwai@suse.de>
Tue, 15 Dec 2009 09:33:51 +0000
(10:33 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 15 Dec 2009 09:33:51 +0000
(10:33 +0100)
1
2
sound/pci/hda/patch_realtek.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
sound/pci/hda/patch_realtek.c
index
888b631
,
c9e8607
..
aeed4cc
---
1
/
sound/pci/hda/patch_realtek.c
---
2
/
sound/pci/hda/patch_realtek.c
+++ b/
sound/pci/hda/patch_realtek.c
@@@
-6248,6
-6248,7
+6248,7
@@@
static const char *alc260_models[ALC260
static struct snd_pci_quirk alc260_cfg_tbl[] = {
SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),
+ SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),
SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
@@@
-6621,7
-6622,7
+6622,7
@@@
static struct hda_input_mux alc889A_mb3
/* Front Mic (0x01) unused */
{ "Line", 0x2 },
/* Line 2 (0x03) unused */
- /* CD (0x04) un
s
used? */
+ /* CD (0x04) unused? */
},
};