Merge branch 'upstream/wm8711' into for-2.6.33

diff --combined sound/soc/codecs/Kconfig
index a2bb659ec184d48be50721876bae1a99652c8eed,20ebf7437f9867355da5202d76c92de8093ec31e..3c46f34928ec2acd9da1e81e3f40e8cb6be16c54
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -18,8 -18,6 +18,8 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AD73311 if I2C
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
 +      select SND_SOC_AK4642 if I2C
 +      select SND_SOC_AK4671 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_PCM3008
@@@ -37,6 -35,7 +37,7 @@@
        select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8523 if I2C
        select SND_SOC_WM8580 if I2C
+       select SND_SOC_WM8711 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI
@@@ -94,12 -93,6 +95,12 @@@ config SND_SOC_AK410
  config SND_SOC_AK4535
        tristate
  
 +config SND_SOC_AK4642
 +      tristate
 +
 +config SND_SOC_AK4671
 +      tristate
 +
  # Cirrus Logic CS4270 Codec
  config SND_SOC_CS4270
        tristate
@@@ -164,6 -157,9 +165,9 @@@ config SND_SOC_WM852
  config SND_SOC_WM8580
        tristate
  
+ config SND_SOC_WM8711
+       tristate
+ 
  config SND_SOC_WM8728
        tristate
  

diff --combined sound/soc/codecs/Makefile
index 13f7b4f2a152d2fc3fa20b79243f6288c6a390e0,711d8f5887de6b6c09c189545bd351688513b6f2..fc1c458cbe2f6005cf455b83d65156e7e4feba83
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -5,8 -5,6 +5,8 @@@ snd-soc-ad1980-objs := ad1980.
  snd-soc-ad73311-objs := ad73311.o
  snd-soc-ak4104-objs := ak4104.o
  snd-soc-ak4535-objs := ak4535.o
 +snd-soc-ak4642-objs := ak4642.o
 +snd-soc-ak4671-objs := ak4671.o
  snd-soc-cs4270-objs := cs4270.o
  snd-soc-cx20442-objs := cx20442.o
  snd-soc-l3-objs := l3.o
@@@ -25,6 -23,7 +25,7 @@@ snd-soc-wm8400-objs := wm8400.
  snd-soc-wm8510-objs := wm8510.o
  snd-soc-wm8523-objs := wm8523.o
  snd-soc-wm8580-objs := wm8580.o
+ snd-soc-wm8711-objs := wm8711.o
  snd-soc-wm8728-objs := wm8728.o
  snd-soc-wm8731-objs := wm8731.o
  snd-soc-wm8750-objs := wm8750.o
@@@ -56,8 -55,6 +57,8 @@@ obj-$(CONFIG_SND_SOC_AD1980)  += snd-soc
  obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
  obj-$(CONFIG_SND_SOC_AK4104)  += snd-soc-ak4104.o
  obj-$(CONFIG_SND_SOC_AK4535)  += snd-soc-ak4535.o
 +obj-$(CONFIG_SND_SOC_AK4642)  += snd-soc-ak4642.o
 +obj-$(CONFIG_SND_SOC_AK4671)  += snd-soc-ak4671.o
  obj-$(CONFIG_SND_SOC_CS4270)  += snd-soc-cs4270.o
  obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
  obj-$(CONFIG_SND_SOC_L3)      += snd-soc-l3.o
@@@ -76,6 -73,7 +77,7 @@@ obj-$(CONFIG_SND_SOC_WM8400)  += snd-soc
  obj-$(CONFIG_SND_SOC_WM8510)  += snd-soc-wm8510.o
  obj-$(CONFIG_SND_SOC_WM8523)  += snd-soc-wm8523.o
  obj-$(CONFIG_SND_SOC_WM8580)  += snd-soc-wm8580.o
+ obj-$(CONFIG_SND_SOC_WM8711)  += snd-soc-wm8711.o
  obj-$(CONFIG_SND_SOC_WM8728)  += snd-soc-wm8728.o
  obj-$(CONFIG_SND_SOC_WM8731)  += snd-soc-wm8731.o
  obj-$(CONFIG_SND_SOC_WM8750)  += snd-soc-wm8750.o