Skip to content

L
linux
Commit 28216bf4 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-2.6.37' into for-2.6.38

parents 4514e899 af745bd7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sound/soc/omap/Kconfig
View file @ 28216bf4
...@@ -12,8 +12,8 @@ config SND_OMAP_SOC_MCPDM ...@@ -12,8 +12,8 @@ config SND_OMAP_SOC_MCPDM
config SND_OMAP_SOC_N810 config SND_OMAP_SOC_N810
tristate "SoC Audio support for Nokia N810" tristate "SoC Audio support for Nokia N810"
depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
depends on OMAP_MUX
select SND_OMAP_SOC_MCBSP select SND_OMAP_SOC_MCBSP
select OMAP_MUX
select SND_SOC_TLV320AIC3X select SND_SOC_TLV320AIC3X
help help
Say Y if you want to add support for SoC audio on Nokia N810. Say Y if you want to add support for SoC audio on Nokia N810.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7