diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:13 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:13 -0400 |
| commit | d6ed31534552484a82f41176df644277dbc59e48 (patch) | |
| tree | f36540203b2b7e12a297ba8595f9e8cf99140721 | |
| parent | 762f9b185cde6ccadbaf5ca4d2a1c2535a89824b (diff) | |
| parent | 2a577a7569182cc9a7fb0c91b3a5d031839806c8 (diff) | |
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
| -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 |