summaryrefslogtreecommitdiffstats
path: root/sound/arm/Makefile
diff options
context:
space:
mode:
authorDmitry Baryshkov2008-09-10 03:01:20 +0200
committerJaroslav Kysela2008-09-23 08:18:10 +0200
commita6d77317678148c973bb0131cc5a3a772f756d23 (patch)
tree09cf4c825ce49eccef121d4ad133cfec20246248 /sound/arm/Makefile
parentALSA: pxa2xx-ac97-lib: support building for several CPUs (diff)
downloadkernel-qcow2-linux-a6d77317678148c973bb0131cc5a3a772f756d23.tar.gz
kernel-qcow2-linux-a6d77317678148c973bb0131cc5a3a772f756d23.tar.xz
kernel-qcow2-linux-a6d77317678148c973bb0131cc5a3a772f756d23.zip
ALSA: Separate common pxa2xx-pcm code
ASoC and non-ASoC drivers for PCM DMA on PXA share lots of common code. Move it to pxa2xx-lib. [Fixed some checkpatch warnings -- broonie] Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/arm/Makefile')
-rw-r--r--sound/arm/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index bb2ed884acdd..2054de11de8a 100644
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -12,7 +12,8 @@ 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-objs := pxa2xx-ac97-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