Skip to content

Commit

Permalink
ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Feb 17, 2009
1 parent c844a5d commit cda9043
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
6 changes: 3 additions & 3 deletions sound/isa/cs423x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 0 additions & 24 deletions sound/isa/cs423x/cs4236_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

/*
*
*/
Expand Down Expand Up @@ -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)

0 comments on commit cda9043

Please sign in to comment.