浏览代码

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>
Stephen Warren 13 年之前
父节点
当前提交
a7fda2ba82
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      sound/soc/tegra/Kconfig

+ 6 - 6
sound/soc/tegra/Kconfig

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