On Saturday 26 April 2014 15:21:44 Xia Kaixu wrote:
From: Arnd Bergmann arnd@arndb.de
The missing dependency can lead to build errors, so make it explicit in Kconfig.
Signed-off-by: Arnd Bergmann arnd@arndb.de Signed-off-by: Xia Kaixu kaixu.xia@linaro.org Cc: Mark Brown broonie@kernel.org Cc: Liam Girdwood lgirdwood@gmail.com Cc: Eric Miao eric.y.miao@gmail.com Cc: Russell King linux@arm.linux.org.uk Cc: Haojian Zhuang haojian.zhuang@gmail.com Cc: Ben Dooks ben-linux@fluff.org Cc: Kukjin Kim kgene.kim@samsung.com Cc: Sangbeom Kim sbkim73@samsung.com Cc: alsa-devel@alsa-project.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org
sound/soc/nuc900/Kconfig | 1 + sound/soc/pxa/Kconfig | 2 +- sound/soc/samsung/Kconfig | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/nuc900/Kconfig b/sound/soc/nuc900/Kconfig index a0ed1c6..7f0c954 100644 --- a/sound/soc/nuc900/Kconfig +++ b/sound/soc/nuc900/Kconfig @@ -4,6 +4,7 @@ config SND_SOC_NUC900 tristate "SoC Audio for NUC900 series" depends on ARCH_W90X900
- select SND_SOC_NUC900_AC97 help This option enables support for AC97 mode on the NUC900 SoC.
This part probably should go into patch 6, together with the other nuc900 patch.
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 672dd22..6013938 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -10,7 +10,7 @@ config SND_PXA2XX_SOC config SND_MMP_SOC bool "Soc Audio for Marvell MMP chips"
- depends on ARCH_MMP
- depends on ARCH_MMP && MMP_SRAM select SND_SOC_GENERIC_DMAENGINE_PCM select SND_ARM help
Drop this one for now.
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index b09b5a4..99cc196 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -116,14 +116,14 @@ config SND_SOC_SAMSUNG_SIMTEC config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23 tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
- depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
- depends on SND_SOC_SAMSUNG && ARCH_S3C24XX && I2C select SND_S3C24XX_I2S select SND_SOC_TLV320AIC23_I2C select SND_SOC_SAMSUNG_SIMTEC
config SND_SOC_SAMSUNG_SIMTEC_HERMES tristate "SoC I2S Audio support for Simtec Hermes board"
- depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
- depends on SND_SOC_SAMSUNG && ARCH_S3C24XX && I2C select SND_S3C24XX_I2S select SND_SOC_TLV320AIC3X select SND_SOC_SAMSUNG_SIMTEC
Should should be a separate patch.
@@ -201,7 +201,7 @@ config SND_SOC_SPEYSIDE select SND_SAMSUNG_I2S select SND_SOC_WM8996 select SND_SOC_WM9081
- select SND_SOC_WM0010
- select SND_SOC_WM0010 if SPI select SND_SOC_WM1250_EV1
config SND_SOC_TOBERMORY @@ -217,7 +217,7 @@ config SND_SOC_BELLS select SND_SOC_WM5102 select SND_SOC_WM5110 select SND_SOC_WM9081
- select SND_SOC_WM0010
- select SND_SOC_WM0010 if SPI select SND_SOC_WM1250_EV1
config SND_SOC_LOWLAND
And these too.
Arnd