commit a7fda2ba82b7531158c68f700fa806e645ff3b7c
author Stephen Warren <swarren@nvidia.com> Thu Apr 05 13:14:52 2012 -0600
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Thu Apr 05 21:57:37 2012 +0100
tree 177af2fff5df90f98ff43b8de83ae9e133acbdbd
parent 063dd9d4488184f35c4598fb68f46fbba959d58e

ASoC: tegra: make Tegra20 drivers depend on Tegra20 support

Without this, the Tegra20 drivers can be built into a kernel that's
built only for Tegra30.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

sound/soc/tegra/Kconfig

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 16632b1..d51945e 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -6,7 +6,7 @@
 
 config SND_SOC_TEGRA_DAS
 	tristate
-	depends on SND_SOC_TEGRA
+	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
 	help
 	  Say Y or M if you want to add support for the Tegra DAS module.
 	  You will also need to select the individual machine drivers to
@@ -14,7 +14,7 @@
 
 config SND_SOC_TEGRA_I2S
 	tristate
-	depends on SND_SOC_TEGRA
+	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
 	select SND_SOC_TEGRA_DAS
 	help
 	  Say Y or M if you want to add support for codecs attached to the
@@ -23,7 +23,7 @@
 
 config SND_SOC_TEGRA_SPDIF
 	tristate
-	depends on SND_SOC_TEGRA
+	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
 	default m
 	help
 	  Say Y or M if you want to add support for the SPDIF interface.
@@ -41,7 +41,7 @@
 	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
-	select SND_SOC_TEGRA_I2S
+	select SND_SOC_TEGRA_I2S if ARCH_TEGRA_2x_SOC
 	select SND_SOC_WM8903
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -51,7 +51,7 @@
 config SND_SOC_TEGRA_TRIMSLICE
 	tristate "SoC Audio support for TrimSlice board"
 	depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C
-	select SND_SOC_TEGRA_I2S
+	select SND_SOC_TEGRA_I2S if ARCH_TEGRA_2x_SOC
 	select SND_SOC_TLV320AIC23
 	help
 	  Say Y or M here if you want to add support for SoC audio on the
@@ -60,7 +60,7 @@
 config SND_SOC_TEGRA_ALC5632
 	tristate "SoC Audio support for Tegra boards using an ALC5632 codec"
 	depends on SND_SOC_TEGRA && I2C
-	select SND_SOC_TEGRA_I2S
+	select SND_SOC_TEGRA_I2S if ARCH_TEGRA_2x_SOC
 	select SND_SOC_ALC5632
 	help
 	  Say Y or M here if you want to add support for SoC audio on the