Merge branch 'for-2.6.35' into for-2.6.36

diff --combined sound/soc/codecs/Kconfig
index ea1f5edde3d6a130d14848659f0a36d6dde50e3f,5da30eb6ad008021619ca57924462fadeaa1e800..55bc2beffb3ae5bd20903baf1ac4e9ded35a12c6
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -22,11 -22,9 +22,11 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
 +      select SND_SOC_CS42L51 if I2C
        select SND_SOC_CS4270 if I2C
 -      select SND_SOC_MAX9877 if I2C
        select SND_SOC_DA7210 if I2C
 +      select SND_SOC_JZ4740 if SOC_JZ4740
 +      select SND_SOC_MAX9877 if I2C
        select SND_SOC_PCM3008
        select SND_SOC_SPDIF
        select SND_SOC_SSM2602 if I2C
@@@ -85,8 -83,8 +85,8 @@@
  
  config SND_SOC_WM_HUBS
        tristate
-       default y if SND_SOC_WM8993=y
-       default m if SND_SOC_WM8993=m
+       default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
+       default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
  
  config SND_SOC_AC97_CODEC
        tristate
@@@ -122,13 -120,13 +122,13 @@@ config SND_SOC_AK467
  config SND_SOC_CQ0093VC
        tristate
  
 +config SND_SOC_CS42L51
 +      tristate
 +
  # Cirrus Logic CS4270 Codec
  config SND_SOC_CS4270
        tristate
  
 -config SND_SOC_DA7210
 -        tristate
 -
  # Cirrus Logic CS4270 Codec VD = 3.3V Errata
  # Select if you are affected by the errata where the part will not function
  # if MCLK divide-by-1.5 is selected and VD is set to 3.3V.  The driver will
@@@ -140,15 -138,9 +140,15 @@@ config SND_SOC_CS4270_VD33_ERRAT
  config SND_SOC_CX20442
        tristate
  
 +config SND_SOC_JZ4740_CODEC
 +      tristate
 +
  config SND_SOC_L3
         tristate
  
 +config SND_SOC_DA7210
 +        tristate
 +
  config SND_SOC_PCM3008
         tristate