diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-10 08:19:11 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-10 08:19:11 +0200 |
| commit | 76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f (patch) | |
| tree | 47aabbd33c80cffc07621b1d6fb5b4fa57c2db01 /sound/soc/omap/Kconfig | |
| parent | 7fa58b5c60298c7b6bf665f896479e26645bf9a6 (diff) | |
| parent | 300893b08f3bc7057a7a5f84074090ba66c8b5ca (diff) | |
| download | kernel_goldelico_gta04-76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f.zip kernel_goldelico_gta04-76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f.tar.gz kernel_goldelico_gta04-76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f.tar.bz2 | |
merge linus/master (3.12-rc0); fixed conflicts
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'sound/soc/omap/Kconfig')
| -rw-r--r-- | sound/soc/omap/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 365267f..1132039 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -1,7 +1,7 @@ config SND_OMAP_SOC tristate "SoC Audio for the Texas Instruments OMAP chips" - depends on ARCH_OMAP && DMA_OMAP - select SND_SOC_DMAENGINE_PCM + depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST) + select SND_DMAENGINE_PCM config SND_OMAP_SOC_DMIC tristate @@ -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 && MACH_NOKIA_RX51 + depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) select SND_OMAP_SOC_MCBSP select SND_SOC_TLV320AIC3X select SND_SOC_TPA6130A2 @@ -87,7 +87,7 @@ config SND_OMAP_SOC_OMAP_TWL4030 config SND_OMAP_SOC_OMAP_ABE_TWL6040 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" - depends on TWL6040_CORE && SND_OMAP_SOC && ARCH_OMAP4 + depends on TWL6040_CORE && SND_OMAP_SOC && (ARCH_OMAP4 || COMPILE_TEST) select SND_OMAP_SOC_DMIC select SND_OMAP_SOC_MCPDM select SND_SOC_TWL6040 |