Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

diff --combined sound/soc/codecs/Kconfig
index 054191ed08efb912fcfba43a863e0a143f90bf2e,f6c6d316ac675c5148f8ec1a550e320dea11d6a1..883a312bb2931d3afaee63cbd8a2564c6a447393
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -78,7 -78,6 +78,7 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_WM8990 if I2C
        select SND_SOC_WM8993 if I2C
        select SND_SOC_WM8994 if MFD_WM8994
 +      select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9090 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
@@@ -167,6 -166,9 +167,9 @@@ config SND_SOC_L
  config SND_SOC_DA7210
          tristate
  
+ config SND_SOC_DMIC
+       tristate
+ 
  config SND_SOC_MAX98088
         tristate
  
@@@ -307,9 -309,6 +310,9 @@@ config SND_SOC_WM899
  config SND_SOC_WM8994
        tristate
  
 +config SND_SOC_WM8995
 +      tristate
 +
  config SND_SOC_WM9081
        tristate
  

diff --combined sound/soc/codecs/Makefile
index 6a1e17bbbf83b3cd3b1727b577370f5fa27c5086,9139cf95ff70eb5148b8d1de7b279f1283311a84..579af9c4f1280f82890e55115436b5549cecb298
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -14,6 -14,7 +14,7 @@@ snd-soc-cs42l51-objs := cs42l51.
  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
@@@ -62,7 -63,6 +63,7 @@@ snd-soc-wm8988-objs := wm8988.
  snd-soc-wm8990-objs := wm8990.o
  snd-soc-wm8993-objs := wm8993.o
  snd-soc-wm8994-objs := wm8994.o wm8994-tables.o
 +snd-soc-wm8995-objs := wm8995.o
  snd-soc-wm9081-objs := wm9081.o
  snd-soc-wm9705-objs := wm9705.o
  snd-soc-wm9712-objs := wm9712.o
@@@ -92,6 -92,7 +93,7 @@@ obj-$(CONFIG_SND_SOC_CS42L51) += snd-so
  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
@@@ -141,7 -142,6 +143,7 @@@ obj-$(CONFIG_SND_SOC_WM8988)       += snd-soc
  obj-$(CONFIG_SND_SOC_WM8990)  += snd-soc-wm8990.o
  obj-$(CONFIG_SND_SOC_WM8993)  += snd-soc-wm8993.o
  obj-$(CONFIG_SND_SOC_WM8994)  += snd-soc-wm8994.o
 +obj-$(CONFIG_SND_SOC_WM8995)  += snd-soc-wm8995.o
  obj-$(CONFIG_SND_SOC_WM9081)  += snd-soc-wm9081.o
  obj-$(CONFIG_SND_SOC_WM9705)  += snd-soc-wm9705.o
  obj-$(CONFIG_SND_SOC_WM9712)  += snd-soc-wm9712.o