diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-03 08:43:14 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-03 08:43:14 -0500 |
commit | 0640f84fac8a8aa8e7911c950cd9a4b0199711f6 (patch) | |
tree | 0f7a0f0deb5152461854c91158ba834a1edec5b1 /sound/pci/hda/patch_realtek.c | |
parent | 8c2f767bf3c4a7932898e657c6b12a2234cd2eca (diff) | |
parent | ff7a3267368634e368ebaac68d5e3abf129edd1d (diff) |
Merge branch 'topic/hda-modularize' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 40b3fcd142a3..0bd4e6bf354d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <sound/core.h> | 30 | #include <sound/core.h> |
31 | #include "hda_codec.h" | 31 | #include "hda_codec.h" |
32 | #include "hda_local.h" | 32 | #include "hda_local.h" |
33 | #include "hda_patch.h" | ||
34 | 33 | ||
35 | #define ALC880_FRONT_EVENT 0x01 | 34 | #define ALC880_FRONT_EVENT 0x01 |
36 | #define ALC880_DCVOL_EVENT 0x02 | 35 | #define ALC880_DCVOL_EVENT 0x02 |
@@ -16613,7 +16612,7 @@ static int patch_alc662(struct hda_codec *codec) | |||
16613 | /* | 16612 | /* |
16614 | * patch entries | 16613 | * patch entries |
16615 | */ | 16614 | */ |
16616 | struct hda_codec_preset snd_hda_preset_realtek[] = { | 16615 | static struct hda_codec_preset snd_hda_preset_realtek[] = { |
16617 | { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 }, | 16616 | { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 }, |
16618 | { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 }, | 16617 | { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 }, |
16619 | { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 }, | 16618 | { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 }, |
@@ -16645,3 +16644,26 @@ struct hda_codec_preset snd_hda_preset_realtek[] = { | |||
16645 | { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 }, | 16644 | { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 }, |
16646 | {} /* terminator */ | 16645 | {} /* terminator */ |
16647 | }; | 16646 | }; |
16647 | |||
16648 | MODULE_ALIAS("snd-hda-codec-id:10ec*"); | ||
16649 | |||
16650 | MODULE_LICENSE("GPL"); | ||
16651 | MODULE_DESCRIPTION("Realtek HD-audio codec"); | ||
16652 | |||
16653 | static struct hda_codec_preset_list realtek_list = { | ||
16654 | .preset = snd_hda_preset_realtek, | ||
16655 | .owner = THIS_MODULE, | ||
16656 | }; | ||
16657 | |||
16658 | static int __init patch_realtek_init(void) | ||
16659 | { | ||
16660 | return snd_hda_add_codec_preset(&realtek_list); | ||
16661 | } | ||
16662 | |||
16663 | static void __exit patch_realtek_exit(void) | ||
16664 | { | ||
16665 | snd_hda_delete_codec_preset(&realtek_list); | ||
16666 | } | ||
16667 | |||
16668 | module_init(patch_realtek_init) | ||
16669 | module_exit(patch_realtek_exit) | ||