dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Takashi Iwai 2009-02-17 08:10:54 +01:00
parent c844a5d38e
commit cda9043d56
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/isa/cs423x/Makefile
View File

@ -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

24
sound/isa/cs423x/cs4236_lib.c
View File

@ -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)