Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig

diff --cc sound/soc/tegra/Kconfig
index 14f7119,0f103a1..a759fbe
--- 1/sound/soc/tegra/Kconfig
--- 2/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@@ -14,15 -14,20 +14,22 @@@ config SND_SOC_TEGRA_I2
          Tegra I2S interface. You will also need to select the individual
          machine drivers to support below.
  
 -config SND_TEGRA_SOC_HARMONY
 -      tristate "SoC Audio support for Tegra Harmony reference board"
 -      depends on SND_TEGRA_SOC && MACH_HARMONY && I2C
+ config MACH_HAS_SND_SOC_TEGRA_WM8903
+       bool
+       help
+         Machines that use the SND_SOC_TEGRA_WM8903 driver should select
+         this config option, in order to allow the user to enable
+         SND_SOC_TEGRA_WM8903.
+ 
-       depends on MACH_HARMONY || MACH_VENTANA || MACH_SEABOARD || MACH_KAEN || MACH_AEBL
 +config SND_SOC_TEGRA_WM8903
 +      tristate "SoC Audio support for Tegra boards using a WM8903 codec"
 +      depends on SND_SOC_TEGRA && I2C
++      depends on MACH_HAS_SND_SOC_TEGRA_WM8903
        default m
 -      select SND_TEGRA_SOC_I2S
 +      select SND_SOC_TEGRA_I2S
        select SND_SOC_WM8903
        help
 -        Say Y or M here if you want to add support for SoC audio on the
 -        Tegra Harmony reference board.
 +        Say Y or M here if you want to add support for SoC audio on Tegra
 +        boards using the WM8093 codec. Currently, the supported boards are
 +        Harmony, Ventana, Seaboard, Kaen, and Aebl.