lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/fix/hda' into topic/hda

Browse Source 
Conflicts:
	sound/pci/hda/patch_sigmatel.c
This commit is contained in:
Takashi Iwai
2008-11-12 10:02:04 +01:00
parent f43aa025b7 d7a8943635
commit 90d0be2fc3
2 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/patch_analog.c
View File

@ -3859,6 +3859,8 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
{}
};