aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-17 02:10:54 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-17 02:10:54 -0500
commitcda9043d56cee9fea39e4ee33fd605ae477a1950 (patch)
tree377e8d1793a613d81eda3a72b449e6d3558c7397
parentc844a5d38e4247fc71e371221cf762a2a44d565b (diff)
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>
-rw-r--r--sound/isa/cs423x/Makefile6
-rw-r--r--sound/isa/cs423x/cs4236_lib.c24
2 files changed, 3 insertions, 27 deletions
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 732f66cc036d..6d397e8d54ac 100644
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -3,11 +3,11 @@
3# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> 3# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
4# 4#
5 5
6snd-cs4236-lib-objs := cs4236_lib.o
7snd-cs4231-objs := cs4231.o 6snd-cs4231-objs := cs4231.o
8snd-cs4236-objs := cs4236.o 7snd-cs4236-objs := cs4236.o cs4236_lib.o
9 8
10# Toplevel Module Dependency 9# Toplevel Module Dependency
11obj-$(CONFIG_SND_CS4231) += snd-cs4231.o 10obj-$(CONFIG_SND_CS4231) += snd-cs4231.o
12obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o 11obj-$(CONFIG_SND_CS4236) += snd-cs4236.o
12
13 13
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 2406efdfd8dd..38835f31298b 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -88,10 +88,6 @@
88#include <sound/wss.h> 88#include <sound/wss.h>
89#include <sound/asoundef.h> 89#include <sound/asoundef.h>
90 90
91MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
92MODULE_DESCRIPTION("Routines for control of CS4235/4236B/4237B/4238B/4239 chips");
93MODULE_LICENSE("GPL");
94
95/* 91/*
96 * 92 *
97 */ 93 */
@@ -1022,23 +1018,3 @@ int snd_cs4236_mixer(struct snd_wss *chip)
1022 } 1018 }
1023 return 0; 1019 return 0;
1024} 1020}
1025
1026EXPORT_SYMBOL(snd_cs4236_create);
1027EXPORT_SYMBOL(snd_cs4236_pcm);
1028EXPORT_SYMBOL(snd_cs4236_mixer);
1029
1030/*
1031 * INIT part
1032 */
1033
1034static int __init alsa_cs4236_init(void)
1035{
1036 return 0;
1037}
1038
1039static void __exit alsa_cs4236_exit(void)
1040{
1041}
1042
1043module_init(alsa_cs4236_init)
1044module_exit(alsa_cs4236_exit)