---

yaml --- r: 332045 b: refs/heads/master c: 0ed275e h: refs/heads/master i: 332043: b9466bf v: v3
git-mirror · Aug 28, 2012 · 6140a23 · 6140a23
1 parent 11f9a0a
commit 6140a23
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/sound/soc/cirrus/Kconfig b/trunk/sound/soc/ep93xx/Kconfig → trunk/sound/soc/cirrus/Kconfig
diff --git a/trunk/sound/soc/ep93xx/Makefile → trunk/sound/soc/cirrus/Makefile b/trunk/sound/soc/ep93xx/Makefile → trunk/sound/soc/cirrus/Makefile
diff --git a/trunk/sound/soc/ep93xx/edb93xx.c → trunk/sound/soc/cirrus/edb93xx.c b/trunk/sound/soc/ep93xx/edb93xx.c → trunk/sound/soc/cirrus/edb93xx.c
diff --git a/trunk/sound/soc/ep93xx/ep93xx-ac97.c → trunk/sound/soc/cirrus/ep93xx-ac97.c b/trunk/sound/soc/ep93xx/ep93xx-ac97.c → trunk/sound/soc/cirrus/ep93xx-ac97.c
diff --git a/trunk/sound/soc/ep93xx/ep93xx-i2s.c → trunk/sound/soc/cirrus/ep93xx-i2s.c b/trunk/sound/soc/ep93xx/ep93xx-i2s.c → trunk/sound/soc/cirrus/ep93xx-i2s.c
diff --git a/trunk/sound/soc/ep93xx/ep93xx-pcm.c → trunk/sound/soc/cirrus/ep93xx-pcm.c b/trunk/sound/soc/ep93xx/ep93xx-pcm.c → trunk/sound/soc/cirrus/ep93xx-pcm.c
diff --git a/trunk/sound/soc/ep93xx/ep93xx-pcm.h → trunk/sound/soc/cirrus/ep93xx-pcm.h b/trunk/sound/soc/ep93xx/ep93xx-pcm.h → trunk/sound/soc/cirrus/ep93xx-pcm.h
diff --git a/trunk/sound/soc/ep93xx/simone.c → trunk/sound/soc/cirrus/simone.c b/trunk/sound/soc/ep93xx/simone.c → trunk/sound/soc/cirrus/simone.c
diff --git a/trunk/sound/soc/ep93xx/snappercl15.c → trunk/sound/soc/cirrus/snappercl15.c b/trunk/sound/soc/ep93xx/snappercl15.c → trunk/sound/soc/cirrus/snappercl15.c