aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x/Makefile
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2009-02-16 15:38:37 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-16 17:05:25 -0500
commitc2b73d1458014a9f461b75bc1756a699a6c0781f (patch)
treed869727d6002ebf48fdb875b490108d85c5ff761 /sound/isa/cs423x/Makefile
parent96cf45cf559be375de29dd45afc50fa8946fb2aa (diff)
ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection
cs4232 and cs4236 driver merge to solve PnP BIOS detection. Also, the patch adds recognition if the chip is cs4236b+ or earlier part. This unifies drivers for both cs4232 and cs4236+ chips. It allows to use the PnP BIOS detection for the cs4236+ chips. Previously, only the snd-cs4232 could be detected by the PnP BIOS. The cs4232+ cards reports two separate PnP BIOS ids. The patch adds search for the second id to find out resources assigned to a control port. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cs423x/Makefile')
-rw-r--r--sound/isa/cs423x/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 5870ca21ab59..732f66cc036d 100644
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -5,11 +5,9 @@
5 5
6snd-cs4236-lib-objs := cs4236_lib.o 6snd-cs4236-lib-objs := cs4236_lib.o
7snd-cs4231-objs := cs4231.o 7snd-cs4231-objs := cs4231.o
8snd-cs4232-objs := cs4232.o
9snd-cs4236-objs := cs4236.o 8snd-cs4236-objs := cs4236.o
10 9
11# Toplevel Module Dependency 10# Toplevel Module Dependency
12obj-$(CONFIG_SND_CS4231) += snd-cs4231.o 11obj-$(CONFIG_SND_CS4231) += snd-cs4231.o
13obj-$(CONFIG_SND_CS4232) += snd-cs4232.o
14obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o 12obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o
15 13