aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-12 14:03:09 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-12 14:03:09 -0400
commitf8be792d515045a4ecfec0bc9cd883d1b070f132 (patch)
tree497570bf0564503a08bfa6058a435506f39b509f /sound/pci
parent80986be4864239dde9bb69e90be7707344f03725 (diff)
parenta5c0f88678cd2fb1f649f7d366d756f2b2f97f0c (diff)
Merge branch 'topic/hda' into for-linus
* topic/hda: ALSA: hda - add quirk for STAC92xx (SigmaTel STAC9205)
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_sigmatel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 42f944bb641d..93e47c96a38b 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1590,6 +1590,8 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
1590 /* SigmaTel reference board */ 1590 /* SigmaTel reference board */
1591 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, 1591 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
1592 "DFI LanParty", STAC_REF), 1592 "DFI LanParty", STAC_REF),
1593 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xfb30,
1594 "SigmaTel",STAC_9205_REF),
1593 SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, 1595 SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,
1594 "DFI LanParty", STAC_REF), 1596 "DFI LanParty", STAC_REF),
1595 /* Dell laptops have BIOS problem */ 1597 /* Dell laptops have BIOS problem */
@@ -5938,6 +5940,7 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
5938 { .id = 0x83847661, .name = "CXD9872RD/K", .patch = patch_stac9872 }, 5940 { .id = 0x83847661, .name = "CXD9872RD/K", .patch = patch_stac9872 },
5939 { .id = 0x83847662, .name = "STAC9872AK", .patch = patch_stac9872 }, 5941 { .id = 0x83847662, .name = "STAC9872AK", .patch = patch_stac9872 },
5940 { .id = 0x83847664, .name = "CXD9872AKD", .patch = patch_stac9872 }, 5942 { .id = 0x83847664, .name = "CXD9872AKD", .patch = patch_stac9872 },
5943 { .id = 0x83847698, .name = "STAC9205", .patch = patch_stac9205 },
5941 { .id = 0x838476a0, .name = "STAC9205", .patch = patch_stac9205 }, 5944 { .id = 0x838476a0, .name = "STAC9205", .patch = patch_stac9205 },
5942 { .id = 0x838476a1, .name = "STAC9205D", .patch = patch_stac9205 }, 5945 { .id = 0x838476a1, .name = "STAC9205D", .patch = patch_stac9205 },
5943 { .id = 0x838476a2, .name = "STAC9204", .patch = patch_stac9205 }, 5946 { .id = 0x838476a2, .name = "STAC9204", .patch = patch_stac9205 },