diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-17 08:10:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-17 08:10:54 +0100 |
| commit | cda9043d56cee9fea39e4ee33fd605ae477a1950 (patch) | |
| tree | 377e8d1793a613d81eda3a72b449e6d3558c7397 /sound/isa | |
| parent | c844a5d38e4247fc71e371221cf762a2a44d565b (diff) | |
| download | linux-3.10-cda9043d56cee9fea39e4ee33fd605ae477a1950.tar.gz linux-3.10-cda9043d56cee9fea39e4ee33fd605ae477a1950.tar.bz2 linux-3.10-cda9043d56cee9fea39e4ee33fd605ae477a1950.zip | |
ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236
Since cs4232 and cs4236 drivers are merged, there is no reason to keep
snd-cs4236-lib module separately. Let's merge it into the main driver
as well.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/cs423x/Makefile | 6 | ||||
| -rw-r--r-- | sound/isa/cs423x/cs4236_lib.c | 24 |
2 files changed, 3 insertions, 27 deletions
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile index 732f66cc036..6d397e8d54a 100644 --- a/sound/isa/cs423x/Makefile +++ b/sound/isa/cs423x/Makefile @@ -3,11 +3,11 @@ # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # -snd-cs4236-lib-objs := cs4236_lib.o snd-cs4231-objs := cs4231.o -snd-cs4236-objs := cs4236.o +snd-cs4236-objs := cs4236.o cs4236_lib.o # Toplevel Module Dependency obj-$(CONFIG_SND_CS4231) += snd-cs4231.o -obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o +obj-$(CONFIG_SND_CS4236) += snd-cs4236.o + diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 2406efdfd8d..38835f31298 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -88,10 +88,6 @@ #include <sound/wss.h> #include <sound/asoundef.h> -MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); -MODULE_DESCRIPTION("Routines for control of CS4235/4236B/4237B/4238B/4239 chips"); -MODULE_LICENSE("GPL"); - /* * */ @@ -1022,23 +1018,3 @@ int snd_cs4236_mixer(struct snd_wss *chip) } return 0; } - -EXPORT_SYMBOL(snd_cs4236_create); -EXPORT_SYMBOL(snd_cs4236_pcm); -EXPORT_SYMBOL(snd_cs4236_mixer); - -/* - * INIT part - */ - -static int __init alsa_cs4236_init(void) -{ - return 0; -} - -static void __exit alsa_cs4236_exit(void) -{ -} - -module_init(alsa_cs4236_init) -module_exit(alsa_cs4236_exit) |