Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx',...

diff --combined sound/soc/omap/Kconfig
index 5c471d92089848a146f7132ee1dc32b225efc9a8,5185a3844da90d207413457defec90d29a691ff4,5185a3844da90d207413457defec90d29a691ff4,5185a3844da90d207413457defec90d29a691ff4,c82fa542c9e705a8ce892fcce121d70f5c15a103,5185a3844da90d207413457defec90d29a691ff4..f5451c78ede55e777b5aa6814b9a1db2daa16136
--- 1/sound/soc/omap/Kconfig
--- 2/sound/soc/omap/Kconfig
--- 3/sound/soc/omap/Kconfig
--- 4/sound/soc/omap/Kconfig
--- 5/sound/soc/omap/Kconfig
--- 6/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@@@@@@ -100,14 -100,13 -100,13 -100,13 -100,13 -100,13 +100,14 @@@@@@@ config SND_OMAP_SOC_OMAP_TWL403
      
      config SND_OMAP_SOC_OMAP_ABE_TWL6040
        tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
---- -  depends on TWL6040_CORE && SND_OMAP_SOC
++++ +  depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK
        depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
        select SND_OMAP_SOC_DMIC
        select SND_OMAP_SOC_MCPDM
        select SND_SOC_TWL6040
        select SND_SOC_DMIC
        select COMMON_CLK_PALMAS if (SOC_OMAP5 && MFD_PALMAS)
 +++++  select CLK_TWL6040
        help
          Say Y if you want to add support for SoC audio on OMAP boards using
          ABE and twl6040 codec. This driver currently supports: