Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus

d6ed3153 · Mark Brown · 762f9b18 · 2a577a75 · d6ed3153
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

sound/soc/omap/Kconfig sound/soc/omap/Kconfig +2 -2

未找到文件。
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
 config SND_OMAP_SOC
 	tristate "SoC Audio for the Texas Instruments OMAP chips"
-	depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST)
+	depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST)
 	select SND_DMAENGINE_PCM

 config SND_OMAP_SOC_DMIC
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810

 config SND_OMAP_SOC_RX51
 	tristate "SoC Audio support for Nokia RX-51"
-	depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
+	depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
 	select SND_OMAP_SOC_MCBSP
 	select SND_SOC_TLV320AIC3X
 	select SND_SOC_TPA6130A2