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