diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-05 12:09:22 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-05 23:35:29 +0900 |
| commit | 9af8381023e48bfc61a1017c584cb3b8115cb462 (patch) | |
| tree | 1d980b1084c6db0bd23c86588d2953fe35e6e75d | |
| parent | ce93a3702832121d517ad348817929f22fcce47c (diff) | |
| download | op-kernel-dev-9af8381023e48bfc61a1017c584cb3b8115cb462.zip op-kernel-dev-9af8381023e48bfc61a1017c584cb3b8115cb462.tar.gz | |
ASoC: Fix sorting of Makefile and Kconfig
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | sound/soc/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 7137a9a..3e598e7 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -31,6 +31,7 @@ source "sound/soc/davinci/Kconfig" source "sound/soc/ep93xx/Kconfig" source "sound/soc/fsl/Kconfig" source "sound/soc/imx/Kconfig" +source "sound/soc/jz4740/Kconfig" source "sound/soc/nuc900/Kconfig" source "sound/soc/omap/Kconfig" source "sound/soc/kirkwood/Kconfig" @@ -39,7 +40,6 @@ source "sound/soc/s3c24xx/Kconfig" source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" source "sound/soc/txx9/Kconfig" -source "sound/soc/jz4740/Kconfig" # Supported codecs source "sound/soc/codecs/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index d131999..eb18344 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_SND_SOC) += davinci/ obj-$(CONFIG_SND_SOC) += ep93xx/ obj-$(CONFIG_SND_SOC) += fsl/ obj-$(CONFIG_SND_SOC) += imx/ +obj-$(CONFIG_SND_SOC) += jz4740/ obj-$(CONFIG_SND_SOC) += nuc900/ obj-$(CONFIG_SND_SOC) += omap/ obj-$(CONFIG_SND_SOC) += kirkwood/ @@ -17,4 +18,3 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/ obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += txx9/ -obj-$(CONFIG_SND_SOC) += jz4740/ |
