diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-29 03:17:05 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-29 03:17:05 -0400 |
| commit | 1b063c3d090c45298a37ebc879c71379cf845d9c (patch) | |
| tree | 18abf3e6b306e7fa3db9b6a638ae511378d7e08b /sound/pci/hda/hda_codec.c | |
| parent | d301fc320f3e673a49200d9ce51036caa9abd768 (diff) | |
| parent | c1e99bd9d6a0c82f4fa9078ed1f570e57b2f3944 (diff) | |
Merge branch 'topic/fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index eaa8b5676eae..8991db78fb67 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -64,6 +64,7 @@ static struct hda_vendor_id hda_vendor_ids[] = { | |||
| 64 | { 0x14f1, "Conexant" }, | 64 | { 0x14f1, "Conexant" }, |
| 65 | { 0x17e8, "Chrontel" }, | 65 | { 0x17e8, "Chrontel" }, |
| 66 | { 0x1854, "LG" }, | 66 | { 0x1854, "LG" }, |
| 67 | { 0x1aec, "Wolfson Microelectronics" }, | ||
| 67 | { 0x434d, "C-Media" }, | 68 | { 0x434d, "C-Media" }, |
| 68 | { 0x8384, "SigmaTel" }, | 69 | { 0x8384, "SigmaTel" }, |
| 69 | {} /* terminator */ | 70 | {} /* terminator */ |