ASoC: Fix sorting of Makefile and Kconfig

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 7137a9a09570c3384810db26b3f87ab71159d58d..3e598e756e54d1f19c038fa0d41d393fb6fd2eb4 100644 (file)
--- 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 d13199978d36bdb3ce153ee1b145d9bd7f76a4bf..eb183443eee4f355744f86181d9b1ef065b003d2 100644 (file)
--- 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/