summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-12-20 10:28:51 +0100
committerTakashi Iwai <tiwai@suse.de>2010-12-20 10:28:51 +0100
commit67c6dc4df1ecdc434260898d5a4163e78c36b240 (patch)
tree60f853409f2c2ec20bba9b7da6ab9995e86665c5 /sound/pci/hda/patch_conexant.c
parent30fac30103185d853cb5cdb4bbed70d629d6da7e (diff)
parent022c92befa539174125b0a1b5e52dd57affefe9f (diff)
downloadop-kernel-dev-67c6dc4df1ecdc434260898d5a4163e78c36b240.zip
op-kernel-dev-67c6dc4df1ecdc434260898d5a4163e78c36b240.tar.gz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r--sound/pci/hda/patch_conexant.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 96b286a..e584b3d 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3097,8 +3097,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = {
static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
- SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
- CXT5066_DELL_LAPTOP),
+ SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),
SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),
OpenPOWER on IntegriCloud