Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c92371566ea505cf455c208cdfb89046b3db87de

Authored by Russell King
Committed by Linus Torvalds
1 parent a2822e7f00
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 9 additions and 7 deletions Side-by-side Diff

... ... @@ -2,13 +2,15 @@
2 2 # Makefile for ALSA
3 3 #
4 4  
5   -snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
6   -snd-aaci-objs := aaci.o devdma.o
7   -snd-pxa2xx-pcm-objs := pxa2xx-pcm.o
8   -snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
9   -
10 5 obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o
  6 +snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
  7 +
11 8 obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o
12   -obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o
13   -obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
  9 +snd-aaci-objs := aaci.o devdma.o
  10 +
  11 +obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o
  12 +snd-pxa2xx-pcm-objs := pxa2xx-pcm.o
  13 +
  14 +obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
  15 +snd-pxa2xx-ac97-objs := pxa2xx-ac97.o