Commit 92359d6d authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus

parents 686b3771 2a577a75
config SND_OMAP_SOC config SND_OMAP_SOC
tristate "SoC Audio for the Texas Instruments OMAP chips" 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 select SND_DMAENGINE_PCM
config SND_OMAP_SOC_DMIC config SND_OMAP_SOC_DMIC
...@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810 ...@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810
config SND_OMAP_SOC_RX51 config SND_OMAP_SOC_RX51
tristate "SoC Audio support for Nokia RX-51" 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_OMAP_SOC_MCBSP
select SND_SOC_TLV320AIC3X select SND_SOC_TLV320AIC3X
select SND_SOC_TPA6130A2 select SND_SOC_TPA6130A2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment