Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 2054de11de8a2140ce7f4052c0233ba5fb183fb6..b55e17bd22109214f92e5f96210967007edfc503 100644 (file)
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -17,3 +17,5 @@ snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97)  += pxa2xx-ac97-lib.o
 
 obj-$(CONFIG_SND_PXA2XX_AC97)  += snd-pxa2xx-ac97.o
 snd-pxa2xx-ac97-objs           := pxa2xx-ac97.o
+
+obj-$(CONFIG_SND) += omap/