diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-04 23:09:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-07-05 10:35:29 -0400 |
commit | 9af8381023e48bfc61a1017c584cb3b8115cb462 (patch) | |
tree | 1d980b1084c6db0bd23c86588d2953fe35e6e75d | |
parent | ce93a3702832121d517ad348817929f22fcce47c (diff) |
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 7137a9a09570..3e598e756e54 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
@@ -31,6 +31,7 @@ source "sound/soc/davinci/Kconfig" | |||
31 | source "sound/soc/ep93xx/Kconfig" | 31 | source "sound/soc/ep93xx/Kconfig" |
32 | source "sound/soc/fsl/Kconfig" | 32 | source "sound/soc/fsl/Kconfig" |
33 | source "sound/soc/imx/Kconfig" | 33 | source "sound/soc/imx/Kconfig" |
34 | source "sound/soc/jz4740/Kconfig" | ||
34 | source "sound/soc/nuc900/Kconfig" | 35 | source "sound/soc/nuc900/Kconfig" |
35 | source "sound/soc/omap/Kconfig" | 36 | source "sound/soc/omap/Kconfig" |
36 | source "sound/soc/kirkwood/Kconfig" | 37 | source "sound/soc/kirkwood/Kconfig" |
@@ -39,7 +40,6 @@ source "sound/soc/s3c24xx/Kconfig" | |||
39 | source "sound/soc/s6000/Kconfig" | 40 | source "sound/soc/s6000/Kconfig" |
40 | source "sound/soc/sh/Kconfig" | 41 | source "sound/soc/sh/Kconfig" |
41 | source "sound/soc/txx9/Kconfig" | 42 | source "sound/soc/txx9/Kconfig" |
42 | source "sound/soc/jz4740/Kconfig" | ||
43 | 43 | ||
44 | # Supported codecs | 44 | # Supported codecs |
45 | source "sound/soc/codecs/Kconfig" | 45 | source "sound/soc/codecs/Kconfig" |
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index d13199978d36..eb183443eee4 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile | |||
@@ -9,6 +9,7 @@ obj-$(CONFIG_SND_SOC) += davinci/ | |||
9 | obj-$(CONFIG_SND_SOC) += ep93xx/ | 9 | obj-$(CONFIG_SND_SOC) += ep93xx/ |
10 | obj-$(CONFIG_SND_SOC) += fsl/ | 10 | obj-$(CONFIG_SND_SOC) += fsl/ |
11 | obj-$(CONFIG_SND_SOC) += imx/ | 11 | obj-$(CONFIG_SND_SOC) += imx/ |
12 | obj-$(CONFIG_SND_SOC) += jz4740/ | ||
12 | obj-$(CONFIG_SND_SOC) += nuc900/ | 13 | obj-$(CONFIG_SND_SOC) += nuc900/ |
13 | obj-$(CONFIG_SND_SOC) += omap/ | 14 | obj-$(CONFIG_SND_SOC) += omap/ |
14 | obj-$(CONFIG_SND_SOC) += kirkwood/ | 15 | obj-$(CONFIG_SND_SOC) += kirkwood/ |
@@ -17,4 +18,3 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/ | |||
17 | obj-$(CONFIG_SND_SOC) += s6000/ | 18 | obj-$(CONFIG_SND_SOC) += s6000/ |
18 | obj-$(CONFIG_SND_SOC) += sh/ | 19 | obj-$(CONFIG_SND_SOC) += sh/ |
19 | obj-$(CONFIG_SND_SOC) += txx9/ | 20 | obj-$(CONFIG_SND_SOC) += txx9/ |
20 | obj-$(CONFIG_SND_SOC) += jz4740/ | ||