Commit 0b34a3d0 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Ease merge difficulties from new architectures 



Rather than listing lots of architectures per line in Kconfig and
Makefile, causing merge conflicts all the time, have one per line
in alphabetical order.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9cd28ab0

sound/soc/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -22,16 +22,16 @@ if SND_SOC 
config SND_SOC_AC97_BUS

	bool



# All the supported Soc's

# All the supported SoCs

source "sound/soc/atmel/Kconfig"

source "sound/soc/au1x/Kconfig"

source "sound/soc/blackfin/Kconfig"

source "sound/soc/davinci/Kconfig"

source "sound/soc/fsl/Kconfig"

source "sound/soc/omap/Kconfig"

source "sound/soc/pxa/Kconfig"

source "sound/soc/s3c24xx/Kconfig"

source "sound/soc/sh/Kconfig"

source "sound/soc/fsl/Kconfig"

source "sound/soc/davinci/Kconfig"

source "sound/soc/omap/Kconfig"

source "sound/soc/blackfin/Kconfig"



# Supported codecs

source "sound/soc/codecs/Kconfig"

sound/soc/Makefile

+10 −2
Original line number Diff line number Diff line 
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/