diff options
author | Wu Fengguang <wfg@linux.intel.com> | 2008-11-12 21:19:38 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-13 01:55:40 -0500 |
commit | 3a95cb972bb0eb80dfdb42f11628e6d58bcdde29 (patch) | |
tree | 9ae02ad1fa996c8994b1ac89a94dcd4b6781841a | |
parent | 90d0be2fc33b4c4e11fc596da4736189be947d99 (diff) |
ALSA: handle SiI1392 HDMI codec in patch_intelhdmi.c
Move the handling of SiI1392 HDMI codec from patch_atihdmi.c to
patch_intelhdmi.c, which makes our ASUS P5E-VM HDMI board work.
Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_atihdmi.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_intelhdmi.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c index ba61575983fd..5603a1acddb1 100644 --- a/sound/pci/hda/patch_atihdmi.c +++ b/sound/pci/hda/patch_atihdmi.c | |||
@@ -193,7 +193,6 @@ struct hda_codec_preset snd_hda_preset_atihdmi[] = { | |||
193 | { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi }, | 193 | { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi }, |
194 | { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi }, | 194 | { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi }, |
195 | { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi }, | 195 | { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi }, |
196 | { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_atihdmi }, | ||
197 | { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_atihdmi }, | 196 | { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_atihdmi }, |
198 | {} /* terminator */ | 197 | {} /* terminator */ |
199 | }; | 198 | }; |
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c index 3beaf9c1090c..939b37ba7074 100644 --- a/sound/pci/hda/patch_intelhdmi.c +++ b/sound/pci/hda/patch_intelhdmi.c | |||
@@ -924,5 +924,6 @@ struct hda_codec_preset snd_hda_preset_intelhdmi[] = { | |||
924 | { .id = 0x80862801, .name = "INTEL G45 DEVBLC", .patch = patch_intel_hdmi }, | 924 | { .id = 0x80862801, .name = "INTEL G45 DEVBLC", .patch = patch_intel_hdmi }, |
925 | { .id = 0x80862802, .name = "INTEL G45 DEVCTG", .patch = patch_intel_hdmi }, | 925 | { .id = 0x80862802, .name = "INTEL G45 DEVCTG", .patch = patch_intel_hdmi }, |
926 | { .id = 0x80862803, .name = "INTEL G45 DEVELK", .patch = patch_intel_hdmi }, | 926 | { .id = 0x80862803, .name = "INTEL G45 DEVELK", .patch = patch_intel_hdmi }, |
927 | { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_intel_hdmi }, | ||
927 | {} /* terminator */ | 928 | {} /* terminator */ |
928 | }; | 929 | }; |