diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-03 14:43:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-03 14:43:14 +0100 |
| commit | 0640f84fac8a8aa8e7911c950cd9a4b0199711f6 (patch) | |
| tree | 0f7a0f0deb5152461854c91158ba834a1edec5b1 /sound/pci/hda/patch_nvhdmi.c | |
| parent | 8c2f767bf3c4a7932898e657c6b12a2234cd2eca (diff) | |
| parent | ff7a3267368634e368ebaac68d5e3abf129edd1d (diff) | |
| download | talos-op-linux-0640f84fac8a8aa8e7911c950cd9a4b0199711f6.tar.gz talos-op-linux-0640f84fac8a8aa8e7911c950cd9a4b0199711f6.zip | |
Merge branch 'topic/hda-modularize' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_nvhdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index 1360d54a7d01..e23de5594b6e 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -28,7 +28,6 @@ #include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" -#include "hda_patch.h" struct nvhdmi_spec { struct hda_multi_out multiout; @@ -159,8 +158,32 @@ static int patch_nvhdmi(struct hda_codec *codec) /* * patch entries */ -struct hda_codec_preset snd_hda_preset_nvhdmi[] = { +static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { { .id = 0x10de0002, .name = "NVIDIA MCP78 HDMI", .patch = patch_nvhdmi }, { .id = 0x10de0007, .name = "NVIDIA MCP7A HDMI", .patch = patch_nvhdmi }, {} /* terminator */ }; + +MODULE_ALIAS("snd-hda-codec-id:10de0002"); +MODULE_ALIAS("snd-hda-codec-id:10de0007"); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec"); + +static struct hda_codec_preset_list nvhdmi_list = { + .preset = snd_hda_preset_nvhdmi, + .owner = THIS_MODULE, +}; + +static int __init patch_nvhdmi_init(void) +{ + return snd_hda_add_codec_preset(&nvhdmi_list); +} + +static void __exit patch_nvhdmi_exit(void) +{ + snd_hda_delete_codec_preset(&nvhdmi_list); +} + +module_init(patch_nvhdmi_init) +module_exit(patch_nvhdmi_exit) |
