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: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
9cd28ab005
commit
0b34a3d03e
|
@ -22,16 +22,16 @@ if SND_SOC
|
||||||
config SND_SOC_AC97_BUS
|
config SND_SOC_AC97_BUS
|
||||||
bool
|
bool
|
||||||
|
|
||||||
# All the supported Soc's
|
# All the supported SoCs
|
||||||
source "sound/soc/atmel/Kconfig"
|
source "sound/soc/atmel/Kconfig"
|
||||||
source "sound/soc/au1x/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/pxa/Kconfig"
|
||||||
source "sound/soc/s3c24xx/Kconfig"
|
source "sound/soc/s3c24xx/Kconfig"
|
||||||
source "sound/soc/sh/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
|
# Supported codecs
|
||||||
source "sound/soc/codecs/Kconfig"
|
source "sound/soc/codecs/Kconfig"
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
snd-soc-core-objs := soc-core.o soc-dapm.o
|
snd-soc-core-objs := soc-core.o soc-dapm.o
|
||||||
|
|
||||||
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
|
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
|
||||||
obj-$(CONFIG_SND_SOC) += codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/
|
obj-$(CONFIG_SND_SOC) += codecs/
|
||||||
obj-$(CONFIG_SND_SOC) += omap/ au1x/ blackfin/
|
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/
|
||||||
|
|
Loading…
Reference in a new issue