hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2013-10-24 11:23:55 +01:00
parent 686b377152 2a577a7569
commit 92359d6d65
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/omap/Kconfig
View File

@ -1,6 +1,6 @@
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
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