diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-03 12:28:29 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-03 12:28:29 -0500 |
| commit | 28216bf48bbe4314a7a02b7c9822dbb26aca530c (patch) | |
| tree | bb24d2d0fceec287f7468eed6bf2c76ad47e5460 /sound/soc/omap | |
| parent | 4514e8997fbefd5befd6176ac9785e287b4daed4 (diff) | |
| parent | af745bd724e304cc94a88a2fb43d53baffbd63a5 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index d542ea2ff6be..a088db6d5091 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
| @@ -12,8 +12,8 @@ config SND_OMAP_SOC_MCPDM | |||
| 12 | config SND_OMAP_SOC_N810 | 12 | config SND_OMAP_SOC_N810 |
| 13 | tristate "SoC Audio support for Nokia N810" | 13 | tristate "SoC Audio support for Nokia N810" |
| 14 | depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C | 14 | depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C |
| 15 | depends on OMAP_MUX | ||
| 15 | select SND_OMAP_SOC_MCBSP | 16 | select SND_OMAP_SOC_MCBSP |
| 16 | select OMAP_MUX | ||
| 17 | select SND_SOC_TLV320AIC3X | 17 | select SND_SOC_TLV320AIC3X |
| 18 | help | 18 | help |
| 19 | Say Y if you want to add support for SoC audio on Nokia N810. | 19 | Say Y if you want to add support for SoC audio on Nokia N810. |