summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-28 12:02:13 +0200
committerTakashi Iwai <tiwai@suse.de>2009-05-28 12:02:13 +0200
commit817682c11bb836cfe688b5601aa66f2b58a4848e (patch)
tree4b6f9ab78f960fe17a5a8bfb3e8a4f8598bb28b7 /sound
parentf5219b619504875a14b63659eecd86098208620c (diff)
parent1812e67c7410c8d0d57f14a3dc81a99bd5b30e3e (diff)
downloadop-kernel-dev-817682c11bb836cfe688b5601aa66f2b58a4848e.zip
op-kernel-dev-817682c11bb836cfe688b5601aa66f2b58a4848e.tar.gz
Merge branch 'fix/hda' into for-linus
* fix/hda: ALSA: hda - Compaq Presario CQ60 patching for Conexant
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_conexant.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 56ce19e..4fcbe21 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -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),
OpenPOWER on IntegriCloud