---

yaml --- r: 230472 b: refs/heads/master c: b60fc60 h: refs/heads/master v: v3
git-mirror · Jan 10, 2011 · 8d5658d · 8d5658d
1 parent 5e06bc8
commit 8d5658d
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 236 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f55eaab56ea083498034c18e09d356594081fca
+refs/heads/master: b60fc60ceab36cbba218888b52e87998fca06936
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
@@ -167,9 +167,6 @@ config SND_SOC_L3
 config SND_SOC_DA7210
         tristate
 
-config SND_SOC_DMIC
-	tristate
-
 config SND_SOC_MAX98088
        tristate
 

diff --git a/trunk/sound/soc/codecs/Makefile b/trunk/sound/soc/codecs/Makefile
@@ -14,7 +14,6 @@ snd-soc-cs42l51-objs := cs42l51.o
 snd-soc-cs4270-objs := cs4270.o
 snd-soc-cx20442-objs := cx20442.o
 snd-soc-da7210-objs := da7210.o
-snd-soc-dmic-objs := dmic.o
 snd-soc-l3-objs := l3.o
 snd-soc-max98088-objs := max98088.o
 snd-soc-pcm3008-objs := pcm3008.o
@@ -93,7 +92,6 @@ obj-$(CONFIG_SND_SOC_CS42L51)	+= snd-soc-cs42l51.o
 obj-$(CONFIG_SND_SOC_CS4270)	+= snd-soc-cs4270.o
 obj-$(CONFIG_SND_SOC_CX20442)	+= snd-soc-cx20442.o
 obj-$(CONFIG_SND_SOC_DA7210)	+= snd-soc-da7210.o
-obj-$(CONFIG_SND_SOC_DMIC)	+= snd-soc-dmic.o
 obj-$(CONFIG_SND_SOC_L3)	+= snd-soc-l3.o
 obj-$(CONFIG_SND_SOC_JZ4740_CODEC)	+= snd-soc-jz4740-codec.o
 obj-$(CONFIG_SND_SOC_MAX98088)	+= snd-soc-max98088.o

diff --git a/trunk/sound/soc/codecs/dmic.c b/trunk/sound/soc/codecs/dmic.c