ASoC: Ease merge difficulties from new architectures

[firefly-linux-kernel-4.4.55.git] / sound / soc / Makefile

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 4d475c3ceb9142720126aa02ebefef4c8ed1957b..86a9b1f5b0f3cbf83c315505613fd751c8356306 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,13 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o
 
 obj-$(CONFIG_SND_SOC)  += snd-soc-core.o
-obj-$(CONFIG_SND_SOC)  += codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/
-obj-$(CONFIG_SND_SOC)  += omap/ au1x/ blackfin/
+obj-$(CONFIG_SND_SOC)  += codecs/
+obj-$(CONFIG_SND_SOC)  += atmel/
+obj-$(CONFIG_SND_SOC)  += au1x/
+obj-$(CONFIG_SND_SOC)  += blackfin/
+obj-$(CONFIG_SND_SOC)  += davinci/
+obj-$(CONFIG_SND_SOC)  += fsl/
+obj-$(CONFIG_SND_SOC)  += omap/
+obj-$(CONFIG_SND_SOC)  += pxa/
+obj-$(CONFIG_SND_SOC)  += s3c24xx/
+obj-$(CONFIG_SND_SOC)  += sh/