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 bd12f53404a6c1c975db9754381bdc14096c532c..b55e17bd22109214f92e5f96210967007edfc503 100644 (file)
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -11,6 +11,10 @@ snd-aaci-objs                        := aaci.o devdma.o
 obj-$(CONFIG_SND_PXA2XX_PCM)   += snd-pxa2xx-pcm.o
 snd-pxa2xx-pcm-objs            := pxa2xx-pcm.o
 
+obj-$(CONFIG_SND_PXA2XX_LIB)   += snd-pxa2xx-lib.o
+snd-pxa2xx-lib-y               := pxa2xx-pcm-lib.o
+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