diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-04 18:30:01 +0100 |
commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/davinci/Kconfig | |
parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) | |
download | linux-986a622df307644af14618bee54c901aa74816da.tar.bz2 |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/davinci/Kconfig')
-rw-r--r-- | sound/soc/davinci/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 9e11a14d1b45..c82f89c9475b 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -54,16 +54,6 @@ config SND_DM6467_SOC_EVM help Say Y if you want to add support for SoC audio on TI -config SND_DAVINCI_SOC_SFFSDR - tristate "SoC Audio support for SFFSDR" - depends on SND_DAVINCI_SOC && MACH_SFFSDR - select SND_DAVINCI_SOC_I2S - select SND_SOC_PCM3008 - select SFFSDR_FPGA - help - Say Y if you want to add support for SoC audio on - Lyrtech SFFSDR board. - config SND_DA830_SOC_EVM tristate "SoC Audio support for DA830/OMAP-L137 EVM" depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA830_EVM |