Skip to content

Commit d13e436

Browse files
arndbbroonie
authored andcommitted
ASoC: fix ABE_TWL6040 dependency
The TWL6040 ASoC support has recently started turning on CLK_TWL6040, but that fails to build when CONFIG_COMMON_CLK is disabled: warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects CLK_TWL6040 which has unmet direct dependencies (COMMON_CLK && TWL6040_CORE) 0xF18E38F6 Thu Jun 9 18:57:32 CEST 2016 failed In file included from ../include/linux/clocksource.h:18:0, from ../drivers/clocksource/timer-nps.c:34: ../include/linux/of.h:1005:20: error: comparison of distinct pointer types lacks a cast [-Werror] .data = (fn == (fn_type)NULL) ? fn : fn } ^ This adds a dependency to avoid the invalid configuration. Signed-off-by: Arnd Bergmann <[email protected]> Fixes: 443500a ("ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040") Signed-off-by: Mark Brown <[email protected]>
1 parent 1a695a9 commit d13e436

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sound/soc/omap/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ config SND_OMAP_SOC_OMAP_TWL4030
100100

101101
config SND_OMAP_SOC_OMAP_ABE_TWL6040
102102
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
103-
depends on TWL6040_CORE && SND_OMAP_SOC
103+
depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK
104104
depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
105105
select SND_OMAP_SOC_DMIC
106106
select SND_OMAP_SOC_MCPDM

0 commit comments

Comments
 (0)