diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 10:23:55 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 10:23:55 (GMT) |
| commit | 92359d6d65e34c99935514d706fe1ddd0b2f137c (patch) | |
| tree | 998a2e4706386338f6898b16bb376a88a4809666 /sound | |
| parent | 686b37715282222dd8746421e4475387acf12e38 (diff) | |
| parent | 2a577a7569182cc9a7fb0c91b3a5d031839806c8 (diff) | |
| download | linux-fsl-qoriq-92359d6d65e34c99935514d706fe1ddd0b2f137c.tar.xz | |
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index daa78a0..4a07f71 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 |