Index: alsa-driver/pci/Kconfig
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/Kconfig,v
retrieving revision 1.27
diff -u -r1.27 Kconfig
--- alsa-driver/pci/Kconfig	1 Dec 2004 14:06:30 -0000	1.27
+++ alsa-driver/pci/Kconfig	4 Dec 2004 12:30:37 -0000
@@ -36,12 +36,12 @@
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-emu10k1x.
 
-config SND_AUDIGYLS
-	tristate "SB Audigy LS"
+config SND_CA0106
+	tristate "SB Audigy LS / Live 24 bit"
 	depends on SND
 	select SND_AC97_CODEC
 	help
-	  Say Y here to include support for the Sound Blaster Audigy LS.
+	  Say Y here to include support for the Sound Blaster Audigy LS and Live 24bit.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-audigyls.
Index: alsa-driver/pci/Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- alsa-driver/pci/Makefile	1 Dec 2004 14:06:30 -0000	1.31
+++ alsa-driver/pci/Makefile	4 Dec 2004 12:30:37 -0000
@@ -11,7 +11,7 @@
 
 clean-files := bt87x.c intel8x0.c
 
-obj-$(CONFIG_SND) += pdplus/ azx/
+obj-$(CONFIG_SND) += pdplus/ azx/ ca0106/
 
 snd-hdspm-objs := hdspm.o
 snd-asihpi-objs := asihpi.o
Index: alsa-driver/pci/emu10k1/Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/emu10k1/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- alsa-driver/pci/emu10k1/Makefile	18 Jun 2004 14:21:20 -0000	1.7
+++ alsa-driver/pci/emu10k1/Makefile	4 Dec 2004 12:30:37 -0000
@@ -6,10 +6,8 @@
 include $(SND_TOPDIR)/Makefile.conf
 
 snd-emu10k1x-objs := emu10k1x.o
-snd-audigyls-objs := audigyls.o
 
 obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o
-obj-$(CONFIG_SND_AUDIGYLS) += snd-audigyls.o
 
 export-objs  := emu10k1_main.o