Merge branch 'wm8974-upstream' into for-2.6.32

diff --cc sound/soc/codecs/Kconfig
index 910b9162cbbb7242780d90c0644e3fb2287f0131,91daffd30e8bb723df8716641e4d6bc045bf219c..167a5ce06cdf26d4393cd0225afcc9b2ef515c7e
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -44,11 -37,10 +44,12 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_WM8903 if I2C
        select SND_SOC_WM8940 if I2C
        select SND_SOC_WM8960 if I2C
 +      select SND_SOC_WM8961 if I2C
        select SND_SOC_WM8971 if I2C
+       select SND_SOC_WM8974 if I2C
        select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8990 if I2C
 +      select SND_SOC_WM8993 if I2C
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
        select SND_SOC_WM9712 if SND_SOC_AC97_BUS

diff --cc sound/soc/codecs/Makefile
index c7fd2297a06fbf54f04f3eaee911ff99aa71fb8e,9c67d66cdb713ebc6fc27c48f1f658449707f98d..fbab43bbe3a7408daab236e9a294d8d490daba79
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -32,11 -25,10 +32,12 @@@ snd-soc-wm8900-objs := wm8900.
  snd-soc-wm8903-objs := wm8903.o
  snd-soc-wm8940-objs := wm8940.o
  snd-soc-wm8960-objs := wm8960.o
 +snd-soc-wm8961-objs := wm8961.o
  snd-soc-wm8971-objs := wm8971.o
+ snd-soc-wm8974-objs := wm8974.o
  snd-soc-wm8988-objs := wm8988.o
  snd-soc-wm8990-objs := wm8990.o
 +snd-soc-wm8993-objs := wm8993.o
  snd-soc-wm9081-objs := wm9081.o
  snd-soc-wm9705-objs := wm9705.o
  snd-soc-wm9712-objs := wm9712.o
@@@ -79,12 -60,11 +80,13 @@@ obj-$(CONFIG_SND_SOC_WM8776)       += snd-soc
  obj-$(CONFIG_SND_SOC_WM8900)  += snd-soc-wm8900.o
  obj-$(CONFIG_SND_SOC_WM8903)  += snd-soc-wm8903.o
  obj-$(CONFIG_SND_SOC_WM8971)  += snd-soc-wm8971.o
+ obj-$(CONFIG_SND_SOC_WM8974)  += snd-soc-wm8974.o
  obj-$(CONFIG_SND_SOC_WM8940)  += snd-soc-wm8940.o
  obj-$(CONFIG_SND_SOC_WM8960)  += snd-soc-wm8960.o
 +obj-$(CONFIG_SND_SOC_WM8961)  += snd-soc-wm8961.o
  obj-$(CONFIG_SND_SOC_WM8988)  += snd-soc-wm8988.o
  obj-$(CONFIG_SND_SOC_WM8990)  += snd-soc-wm8990.o
 +obj-$(CONFIG_SND_SOC_WM8993)  += snd-soc-wm8993.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