diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2010-12-01 11:01:20 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-12-02 11:42:30 +0000 |
| commit | 0ffd22b694b739b3dc3f80bc93726b581e8e8af5 (patch) | |
| tree | 9f3ad03d76d1d8a0cf35ba368711de6f9a64dc4a /sound/soc | |
| parent | 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb (diff) | |
| download | linux-3.10-0ffd22b694b739b3dc3f80bc93726b581e8e8af5.tar.gz linux-3.10-0ffd22b694b739b3dc3f80bc93726b581e8e8af5.tar.bz2 linux-3.10-0ffd22b694b739b3dc3f80bc93726b581e8e8af5.zip | |
ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency
Not all omap boards use kernel based pin multiplexing so
CONFIG_SND_OMAP_SOC_N810 should not select it by default as it can make
harm to other boards in multi-board kernels.
Therefore put CONFIG_OMAP_MUX as a dependency to N810 ASoC machine driver.
Thanks to Tony Lindgren <tony@atomide.com> for noticing.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
| -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 d542ea2ff6b..a088db6d509 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -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. |