diff options
| author | Jarkko Nikula <jarkko.nikula@bitmer.com> | 2013-10-01 14:20:50 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-03 12:01:05 -0400 |
| commit | 2a577a7569182cc9a7fb0c91b3a5d031839806c8 (patch) | |
| tree | 0475f13ed6839c287ad94e0421cc5f73233dc66a | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
ASoC: omap: Fix incorrect ARM dependency
Commit b0e0a4d ("ASoC: omap: Enable COMPILE_TEST build for DT platforms")
added two incorrect CONFIG_ARCH_ARM dependencies making impossible to select
audio support for Nokia RX-51. Fix this by using correct CONFIG_ARM.
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -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 daa78a0095fa..4a07f7179690 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config SND_OMAP_SOC | 1 | config SND_OMAP_SOC |
| 2 | tristate "SoC Audio for the Texas Instruments OMAP chips" | 2 | tristate "SoC Audio for the Texas Instruments OMAP chips" |
| 3 | depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST) | 3 | depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST) |
| 4 | select SND_DMAENGINE_PCM | 4 | select SND_DMAENGINE_PCM |
| 5 | 5 | ||
| 6 | config SND_OMAP_SOC_DMIC | 6 | config SND_OMAP_SOC_DMIC |
| @@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810 | |||
| 26 | 26 | ||
| 27 | config SND_OMAP_SOC_RX51 | 27 | config SND_OMAP_SOC_RX51 |
| 28 | tristate "SoC Audio support for Nokia RX-51" | 28 | tristate "SoC Audio support for Nokia RX-51" |
| 29 | depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) | 29 | depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) |
| 30 | select SND_OMAP_SOC_MCBSP | 30 | select SND_OMAP_SOC_MCBSP |
| 31 | select SND_SOC_TLV320AIC3X | 31 | select SND_SOC_TLV320AIC3X |
| 32 | select SND_SOC_TPA6130A2 | 32 | select SND_SOC_TPA6130A2 |