netns xfrm: xfrm6_tunnel in netns

[safe/jmp/linux-2.6] / sound / arm / Makefile

diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index f74ec28..8c0c851 100644 (file)
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -2,10 +2,15 @@
 # Makefile for ALSA
 #
 
-snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
+obj-$(CONFIG_SND_ARMAACI)      += snd-aaci.o
+snd-aaci-objs                  := aaci.o
 
-# Toplevel Module Dependency
-obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o 
+obj-$(CONFIG_SND_PXA2XX_PCM)   += snd-pxa2xx-pcm.o
+snd-pxa2xx-pcm-objs            := pxa2xx-pcm.o
 
-obj-$(CONFIG_SND_ARMAACI)      += snd-aaci.o
-snd-aaci-objs                  := aaci.o devdma.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