diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-03 10:39:49 +0100 |
| commit | 1ecf44503bc3287cb9e7b8661bffbfe225f14fea (patch) | |
| tree | ecaaa05f784c380960a4622060703f758eefce9a /sound/soc/fsl/Kconfig | |
| parent | 641783ac27698c5d520751d9cebcdd79a51d137f (diff) | |
| parent | 287d414eacaa681413ea89adfa5b3a0d12d2ab1a (diff) | |
Merge remote-tracking branch 'asoc/topic/fsl-ssi' into asoc-next
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index d262ec0653d..37933629cbe 100644 --- 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 |