Merge mainline v2.6.27-rc2 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 0dbb89e83c7e039c896e7e83641b3c8b061b67f3..45b56473b4fbef30fca3e1296f9fba1ee914e13c 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -33,11 +33,8 @@ 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_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
 
-obj-$(CONFIG_SOUND_WM97XX)     += ac97_plugin_wm97xx.o
-
 obj-$(CONFIG_DMASOUND)         += dmasound/
 
 # Declare multi-part drivers.