From 6140a23a320e6dfc24c42b053027c99966f4ed4b Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 21 Aug 2012 19:21:51 +0400 Subject: [PATCH] --- yaml --- r: 332045 b: refs/heads/master c: 0ed275eff31029c39355828cb48c46c0a006e2f8 h: refs/heads/master i: 332043: b9466bf77a2655981762b2521340d8b253ec8bed v: v3 --- [refs] | 2 +- trunk/sound/soc/Kconfig | 2 +- trunk/sound/soc/Makefile | 2 +- trunk/sound/soc/{ep93xx => cirrus}/Kconfig | 0 trunk/sound/soc/{ep93xx => cirrus}/Makefile | 0 trunk/sound/soc/{ep93xx => cirrus}/edb93xx.c | 0 trunk/sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0 trunk/sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0 trunk/sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0 trunk/sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0 trunk/sound/soc/{ep93xx => cirrus}/simone.c | 0 trunk/sound/soc/{ep93xx => cirrus}/snappercl15.c | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename trunk/sound/soc/{ep93xx => cirrus}/Kconfig (100%) rename trunk/sound/soc/{ep93xx => cirrus}/Makefile (100%) rename trunk/sound/soc/{ep93xx => cirrus}/edb93xx.c (100%) rename trunk/sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%) rename trunk/sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%) rename trunk/sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%) rename trunk/sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%) rename trunk/sound/soc/{ep93xx => cirrus}/simone.c (100%) rename trunk/sound/soc/{ep93xx => cirrus}/snappercl15.c (100%) diff --git a/[refs] b/[refs] index 91d38d7561eb..ff0cce31feac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d721a34e66e8133404bda6852897b818df69b4c +refs/heads/master: 0ed275eff31029c39355828cb48c46c0a006e2f8 diff --git a/trunk/sound/soc/Kconfig b/trunk/sound/soc/Kconfig index c24de902f5f5..5da8ca7aee05 100644 --- a/trunk/sound/soc/Kconfig +++ b/trunk/sound/soc/Kconfig @@ -33,9 +33,9 @@ config SND_SOC_DMAENGINE_PCM source "sound/soc/atmel/Kconfig" source "sound/soc/au1x/Kconfig" source "sound/soc/blackfin/Kconfig" +source "sound/soc/cirrus/Kconfig" source "sound/soc/davinci/Kconfig" source "sound/soc/dwc/Kconfig" -source "sound/soc/ep93xx/Kconfig" source "sound/soc/fsl/Kconfig" source "sound/soc/jz4740/Kconfig" source "sound/soc/nuc900/Kconfig" diff --git a/trunk/sound/soc/Makefile b/trunk/sound/soc/Makefile index c1264007b4ee..bcbf1d00aa85 100644 --- a/trunk/sound/soc/Makefile +++ b/trunk/sound/soc/Makefile @@ -10,9 +10,9 @@ obj-$(CONFIG_SND_SOC) += generic/ obj-$(CONFIG_SND_SOC) += atmel/ obj-$(CONFIG_SND_SOC) += au1x/ obj-$(CONFIG_SND_SOC) += blackfin/ +obj-$(CONFIG_SND_SOC) += cirrus/ obj-$(CONFIG_SND_SOC) += davinci/ obj-$(CONFIG_SND_SOC) += dwc/ -obj-$(CONFIG_SND_SOC) += ep93xx/ obj-$(CONFIG_SND_SOC) += fsl/ obj-$(CONFIG_SND_SOC) += jz4740/ obj-$(CONFIG_SND_SOC) += mid-x86/ diff --git a/trunk/sound/soc/ep93xx/Kconfig b/trunk/sound/soc/cirrus/Kconfig similarity index 100% rename from trunk/sound/soc/ep93xx/Kconfig rename to trunk/sound/soc/cirrus/Kconfig diff --git a/trunk/sound/soc/ep93xx/Makefile b/trunk/sound/soc/cirrus/Makefile similarity index 100% rename from trunk/sound/soc/ep93xx/Makefile rename to trunk/sound/soc/cirrus/Makefile diff --git a/trunk/sound/soc/ep93xx/edb93xx.c b/trunk/sound/soc/cirrus/edb93xx.c similarity index 100% rename from trunk/sound/soc/ep93xx/edb93xx.c rename to trunk/sound/soc/cirrus/edb93xx.c diff --git a/trunk/sound/soc/ep93xx/ep93xx-ac97.c b/trunk/sound/soc/cirrus/ep93xx-ac97.c similarity index 100% rename from trunk/sound/soc/ep93xx/ep93xx-ac97.c rename to trunk/sound/soc/cirrus/ep93xx-ac97.c diff --git a/trunk/sound/soc/ep93xx/ep93xx-i2s.c b/trunk/sound/soc/cirrus/ep93xx-i2s.c similarity index 100% rename from trunk/sound/soc/ep93xx/ep93xx-i2s.c rename to trunk/sound/soc/cirrus/ep93xx-i2s.c diff --git a/trunk/sound/soc/ep93xx/ep93xx-pcm.c b/trunk/sound/soc/cirrus/ep93xx-pcm.c similarity index 100% rename from trunk/sound/soc/ep93xx/ep93xx-pcm.c rename to trunk/sound/soc/cirrus/ep93xx-pcm.c diff --git a/trunk/sound/soc/ep93xx/ep93xx-pcm.h b/trunk/sound/soc/cirrus/ep93xx-pcm.h similarity index 100% rename from trunk/sound/soc/ep93xx/ep93xx-pcm.h rename to trunk/sound/soc/cirrus/ep93xx-pcm.h diff --git a/trunk/sound/soc/ep93xx/simone.c b/trunk/sound/soc/cirrus/simone.c similarity index 100% rename from trunk/sound/soc/ep93xx/simone.c rename to trunk/sound/soc/cirrus/simone.c diff --git a/trunk/sound/soc/ep93xx/snappercl15.c b/trunk/sound/soc/cirrus/snappercl15.c similarity index 100% rename from trunk/sound/soc/ep93xx/snappercl15.c rename to trunk/sound/soc/cirrus/snappercl15.c