Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / sound / pci / ac97 / Makefile

diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index ae36950f256812d4136a2e20bd3b9337ce0fc213..41fa322f0971677382fcb9ab3ba94492139ee20c 100644 (file)
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -6,8 +6,5 @@
 snd-ac97-codec-y := ac97_codec.o ac97_pcm.o
 snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o
 
-snd-ak4531-codec-objs := ak4531_codec.o
-
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o
-obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o