Skip to content

Commit

Permalink
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/lrg/asoc-2.6 into fix/asoc
  • Loading branch information
Takashi Iwai committed Dec 2, 2010
2 parents 2062ea5 + 0ffd22b commit af745bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/omap/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit af745bd

Please sign in to comment.