Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 4ef6dd00c6eeafb9916378ad7098b642a309a0cc..2054de11de8a2140ce7f4052c0233ba5fb183fb6 100644 (file)
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -11,5 +11,9 @@ 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