Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig

1 files changed, 8 insertions, 1 deletions

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 14f711977ae3..a759fbe1263f 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -14,10 +14,17 @@ config SND_SOC_TEGRA_I2S
           Tegra I2S interface. You will also need to select the individual
           machine drivers to support below.
 
+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.
+
 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_HARMONY || MACH_VENTANA || MACH_SEABOARD || MACH_KAEN || MACH_AEBL
+        depends on MACH_HAS_SND_SOC_TEGRA_WM8903
         default m
         select SND_SOC_TEGRA_I2S
         select SND_SOC_WM8903