Merge branch 'for-2.6.37' into for-2.6.38
This commit is contained in:
commit
28216bf48b
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue