| commit | 28216bf48bbe4314a7a02b7c9822dbb26aca530c | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Dec 03 17:28:29 2010 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Fri Dec 03 17:28:29 2010 +0000 |
| tree | bb24d2d0fceec287f7468eed6bf2c76ad47e5460 | |
| parent | 4514e8997fbefd5befd6176ac9785e287b4daed4 [diff] | |
| parent | af745bd724e304cc94a88a2fb43d53baffbd63a5 [diff] |
Merge branch 'for-2.6.37' into for-2.6.38
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index d542ea2..a088db6 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig
@@ -12,8 +12,8 @@ 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.