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 1f86299fae409a297154737002f4466782cc597f..0dbb89e83c7e039c896e7e83641b3c8b061b67f3 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -7,6 +7,10 @@
 
 obj-$(CONFIG_SOUND_OSS)                += sound.o
 
+obj-$(CONFIG_SOUND_OMAP)        += omap-audio-dma-intfc.o omap-audio.o
+obj-$(CONFIG_SOUND_OMAP_TSC2101)+= omap-audio-tsc2101.o
+obj-$(CONFIG_SOUND_OMAP_AIC23)  += omap-audio-aic23.o
+
 # Please leave it as is, cause the link order is significant !
 
 obj-$(CONFIG_SOUND_SH_DAC_AUDIO)       += sh_dac_audio.o