aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-18 14:17:13 +0100
committerMark Brown <broonie@linaro.org>2013-10-18 14:17:13 +0100
commitd6ed31534552484a82f41176df644277dbc59e48 (patch)
treef36540203b2b7e12a297ba8595f9e8cf99140721 /sound
parent762f9b185cde6ccadbaf5ca4d2a1c2535a89824b (diff)
parent2a577a7569182cc9a7fb0c91b3a5d031839806c8 (diff)
downloadlinux-linaro-stable-d6ed31534552484a82f41176df644277dbc59e48.tar.gz
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index daa78a0095fa..4a07f7179690 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -1,6 +1,6 @@
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