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

Commit af745bd7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.37' of... 

Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc
parents 2062ea52 0ffd22b6

sound/soc/omap/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ config SND_OMAP_SOC_MCPDM 
config SND_OMAP_SOC_N810

	tristate "SoC Audio support for Nokia N810"

	depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C

	depends on OMAP_MUX

	select SND_OMAP_SOC_MCBSP

	select OMAP_MUX

	select SND_SOC_TLV320AIC3X

	help

	  Say Y if you want to add support for SoC audio on Nokia N810.