Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / oss / Makefile

diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 1f81a2fc0abd04f540096ffa31180dee8bf268b6..d6f98a15eafb1107c1296e9f56bac423a65712aa 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_SOUND_MSNDCLAS)  += msnd.o msnd_classic.o
 obj-$(CONFIG_SOUND_MSNDPIN)    += msnd.o msnd_pinnacle.o
 obj-$(CONFIG_SOUND_VWSND)      += vwsnd.o
 obj-$(CONFIG_SOUND_ICH)                += i810_audio.o ac97_codec.o
-obj-$(CONFIG_SOUND_ES1371)     += es1371.o ac97_codec.o
 obj-$(CONFIG_SOUND_AU1550_AC97)        += au1550_ac97.o ac97_codec.o
 obj-$(CONFIG_SOUND_TRIDENT)    += trident.o ac97_codec.o
 obj-$(CONFIG_SOUND_BCM_CS4297A)        += swarm_cs4297a.o