diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-02-25 10:42:12 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-06 14:50:25 -0500 |
commit | 3d4cf65e2db58f927ca3cd13b0074b8fe5124659 (patch) | |
tree | bdd4b4d770cafacad711aec381d656be653586bd /sound | |
parent | 6742e15cf92a8dc3065843a627952ed518e08267 (diff) |
ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency
The change to enable OMAP5 support on this platform was a little too
eager in adding a 'select' for a particular clock driver that might
not be enabled in all configurations, which in turn leads to a build
error:
warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS)
drivers/built-in.o: In function `palmas_clks_probe':
drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config'
I do not see a strong dependency here, so it's probably better to
drop this select and to avoid adding more complexity here.
Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-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 e7c78b0406b5..6768e4f7d7d0 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
@@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 | |||
105 | select SND_OMAP_SOC_MCPDM | 105 | select SND_OMAP_SOC_MCPDM |
106 | select SND_SOC_TWL6040 | 106 | select SND_SOC_TWL6040 |
107 | select SND_SOC_DMIC | 107 | select SND_SOC_DMIC |
108 | select COMMON_CLK_PALMAS if SOC_OMAP5 | 108 | select COMMON_CLK_PALMAS if MFD_PALMAS |
109 | help | 109 | help |
110 | Say Y if you want to add support for SoC audio on OMAP boards using | 110 | Say Y if you want to add support for SoC audio on OMAP boards using |
111 | ABE and twl6040 codec. This driver currently supports: | 111 | ABE and twl6040 codec. This driver currently supports: |