Merge tag 'for-f2fs-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[karo-tx-linux.git] / sound / soc / fsl / Kconfig

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index d262ec0653d3709c7e56e9ebce2c2a4bc3796f45..37933629cbedec9787c0225ce8bf00797d719193 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -16,6 +16,7 @@ config SND_SOC_FSL_SSI
        tristate "Synchronous Serial Interface module support"
        select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
        select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC
+       select REGMAP_MMIO
        help
          Say Y if you want to add Synchronous Serial Interface (SSI)
          support for the Freescale CPUs.
@@ -207,12 +208,7 @@ config SND_SOC_PHYCORE_AC97
 
 config SND_SOC_EUKREA_TLV320
        tristate "Eukrea TLV320"
-       depends on MACH_EUKREA_MBIMX27_BASEBOARD \
-               || MACH_EUKREA_MBIMXSD25_BASEBOARD \
-               || MACH_EUKREA_MBIMXSD35_BASEBOARD \
-               || MACH_EUKREA_MBIMXSD51_BASEBOARD \
-               || (OF && ARM)
-       depends on I2C
+       depends on ARCH_MXC && I2C
        select SND_SOC_TLV320AIC23_I2C
        select SND_SOC_IMX_AUDMUX
        select SND_SOC_IMX_SSI