aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-16 09:44:48 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-18 12:21:01 -0500
commit0b34a3d03e2fa615a786027b1ef4cbbd8c807f2c (patch)
tree20c85c91574953a34edae8311194a3df147c7f89 /sound/soc
parent9cd28ab0051cc5232e3dffea6b318233445a3d5f (diff)
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/Kconfig10
-rw-r--r--sound/soc/Makefile12
2 files changed, 15 insertions, 7 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 615ebf0b76e7..ef025c66cc66 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -22,16 +22,16 @@ if SND_SOC
22config SND_SOC_AC97_BUS 22config SND_SOC_AC97_BUS
23 bool 23 bool
24 24
25# All the supported Soc's 25# All the supported SoCs
26source "sound/soc/atmel/Kconfig" 26source "sound/soc/atmel/Kconfig"
27source "sound/soc/au1x/Kconfig" 27source "sound/soc/au1x/Kconfig"
28source "sound/soc/blackfin/Kconfig"
29source "sound/soc/davinci/Kconfig"
30source "sound/soc/fsl/Kconfig"
31source "sound/soc/omap/Kconfig"
28source "sound/soc/pxa/Kconfig" 32source "sound/soc/pxa/Kconfig"
29source "sound/soc/s3c24xx/Kconfig" 33source "sound/soc/s3c24xx/Kconfig"
30source "sound/soc/sh/Kconfig" 34source "sound/soc/sh/Kconfig"
31source "sound/soc/fsl/Kconfig"
32source "sound/soc/davinci/Kconfig"
33source "sound/soc/omap/Kconfig"
34source "sound/soc/blackfin/Kconfig"
35 35
36# Supported codecs 36# Supported codecs
37source "sound/soc/codecs/Kconfig" 37source "sound/soc/codecs/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 4d475c3ceb91..86a9b1f5b0f3 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,13 @@
1snd-soc-core-objs := soc-core.o soc-dapm.o 1snd-soc-core-objs := soc-core.o soc-dapm.o
2 2
3obj-$(CONFIG_SND_SOC) += snd-soc-core.o 3obj-$(CONFIG_SND_SOC) += snd-soc-core.o
4obj-$(CONFIG_SND_SOC) += codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/ 4obj-$(CONFIG_SND_SOC) += codecs/
5obj-$(CONFIG_SND_SOC) += omap/ au1x/ blackfin/ 5obj-$(CONFIG_SND_SOC) += atmel/
6obj-$(CONFIG_SND_SOC) += au1x/
7obj-$(CONFIG_SND_SOC) += blackfin/
8obj-$(CONFIG_SND_SOC) += davinci/
9obj-$(CONFIG_SND_SOC) += fsl/
10obj-$(CONFIG_SND_SOC) += omap/
11obj-$(CONFIG_SND_SOC) += pxa/
12obj-$(CONFIG_SND_SOC) += s3c24xx/
13obj-$(CONFIG_SND_SOC) += sh/