From 0443c9e97e63dd52f91945c1ecf882f8830f3402 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 5 Jul 2010 12:09:22 +0900 Subject: [PATCH] --- yaml --- r: 206581 b: refs/heads/master c: 9af8381023e48bfc61a1017c584cb3b8115cb462 h: refs/heads/master i: 206579: 05d0bba698b45988170c51c015c216c66774516a v: v3 --- [refs] | 2 +- trunk/sound/soc/Kconfig | 2 +- trunk/sound/soc/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 033423d89704..5c1881744f23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce93a3702832121d517ad348817929f22fcce47c +refs/heads/master: 9af8381023e48bfc61a1017c584cb3b8115cb462 diff --git a/trunk/sound/soc/Kconfig b/trunk/sound/soc/Kconfig index 7137a9a09570..3e598e756e54 100644 --- a/trunk/sound/soc/Kconfig +++ b/trunk/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/trunk/sound/soc/Makefile b/trunk/sound/soc/Makefile index d13199978d36..eb183443eee4 100644 --- a/trunk/sound/soc/Makefile +++ b/trunk/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/