Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 686b3771 2a577a75

sound/soc/omap/Kconfig

+2 −2
Original line number Diff line number Diff line 
config SND_OMAP_SOC

	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



config SND_OMAP_SOC_DMIC
@@ -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 && 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_SOC_TLV320AIC3X

	select SND_SOC_TPA6130A2