diff --git a/[refs] b/[refs] index e23870a68a84..55f1b7dfda38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2822e7f00cdccbff8e507b5ebbddce1aa95eb5d +refs/heads/master: c92371566ea505cf455c208cdfb89046b3db87de diff --git a/trunk/sound/arm/Makefile b/trunk/sound/arm/Makefile index 103f136926d9..4ef6dd00c6ee 100644 --- a/trunk/sound/arm/Makefile +++ b/trunk/sound/arm/Makefile @@ -2,12 +2,14 @@ # Makefile for ALSA # -snd-sa11xx-uda1341-objs := sa11xx-uda1341.o -snd-aaci-objs := aaci.o devdma.o -snd-pxa2xx-pcm-objs := pxa2xx-pcm.o -snd-pxa2xx-ac97-objs := pxa2xx-ac97.o - obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o +snd-sa11xx-uda1341-objs := sa11xx-uda1341.o + obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o -obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o -obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o +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_AC97) += snd-pxa2xx-ac97.o +snd-pxa2xx-ac97-objs := pxa2xx-ac97.o