Merge branch 'linus' into core/generic-dma-coherent

[linux-2.6] / sound / pci / hda / patch_atihdmi.c

diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
index e6fbd5d8fba494d5e2de4d411d62e1e985a30d3e..12272508b1124abebcb68fdcc06458727cbe86da 100644 (file)
--- a/sound/pci/hda/patch_atihdmi.c
+++ b/sound/pci/hda/patch_atihdmi.c
@@ -27,6 +27,7 @@
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 
 struct atihdmi_spec {
        struct hda_multi_out multiout;
@@ -163,7 +164,7 @@ struct hda_codec_preset snd_hda_preset_atihdmi[] = {
        { .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
        { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi },
        { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi },
-       { .id = 0x10951392, .name = "SI HDMI", .patch = patch_atihdmi },
-       { .id = 0x17e80047, .name = "Unknown HDMI",  .patch = patch_atihdmi },
+       { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_atihdmi },
+       { .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },
        {} /* terminator */
 };