diff options
| author | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
| commit | f40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951 (patch) | |
| tree | 1c515a34a60f65cbfd3cf1a387427d0a9fdf878f /sound/pci/hda/patch_conexant.c | |
| parent | 103a196f4224dc6872081305cf7f82ebf67aa7bd (diff) | |
| parent | 46557bef3f3834ac33031c7be27d39d90d507442 (diff) | |
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 3fbbc8c01e70..6479e65858d3 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -2325,6 +2325,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { | |||
| 2325 | CXT5066_LAPTOP), | 2325 | CXT5066_LAPTOP), |
| 2326 | SND_PCI_QUIRK(0x1028, 0x02f5, "Dell", | 2326 | SND_PCI_QUIRK(0x1028, 0x02f5, "Dell", |
| 2327 | CXT5066_DELL_LAPTOP), | 2327 | CXT5066_DELL_LAPTOP), |
| 2328 | SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), | ||
| 2328 | {} | 2329 | {} |
| 2329 | }; | 2330 | }; |
| 2330 | 2331 | ||