Merge branch 'fix/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 28 May 2009 10:02:13 +0000 (12:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 28 May 2009 10:02:13 +0000 (12:02 +0200)
* fix/hda:
  ALSA: hda - Compaq Presario CQ60 patching for Conexant

sound/pci/hda/patch_conexant.c

index 56ce19e68cb5838a24e675828bb990f296717a24..4fcbe21829abfe27104f7dabeed8fb801a301537 100644 (file)
@@ -1848,6 +1848,7 @@ static const char *cxt5051_models[CXT5051_MODELS] = {
 
 static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
        SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),
+       SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),
        SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
                      CXT5051_LAPTOP),
        SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),