summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorRussell King <rmk+lkml@arm.linux.org.uk>2005-09-06 15:16:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:22 -0700
commitc92371566ea505cf455c208cdfb89046b3db87de (patch)
treed3f2871a9f1aeae2955b186e77b59f4b54562700 /sound
parenta2822e7f00cdccbff8e507b5ebbddce1aa95eb5d (diff)
downloadlinux-3.10-c92371566ea505cf455c208cdfb89046b3db87de.tar.gz
linux-3.10-c92371566ea505cf455c208cdfb89046b3db87de.tar.bz2
linux-3.10-c92371566ea505cf455c208cdfb89046b3db87de.zip
[PATCH] Fix sound/arm/Makefile for locality of reference
Ensure that sound/arm/Makefile is sanely organised so that additions to it don't break all other patches out there. This means I only have to adjust the line numbers in my patch queue rather than having to re-generate by hand those which touch this file. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/Makefile16
1 files changed, 9 insertions, 7 deletions
diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 103f136926d..4ef6dd00c6e 100644
--- a/sound/arm/Makefile
+++ b/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