diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-16 17:44:48 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-18 20:21:01 +0300 |
| commit | 0b34a3d03e2fa615a786027b1ef4cbbd8c807f2c (patch) | |
| tree | 20c85c91574953a34edae8311194a3df147c7f89 /sound/soc/Makefile | |
| parent | 9cd28ab0051cc5232e3dffea6b318233445a3d5f (diff) | |
| download | linux-0b34a3d03e2fa615a786027b1ef4cbbd8c807f2c.tar.xz | |
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/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
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 @@ 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/ |