Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic...

[sfrench/cifs-2.6.git] / sound / soc / fsl / Kconfig

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index b7ab71f2ccc1676ec690427ef712c3785ccf80dd..514c275c6108ba52d2503870c4225afdc66b6dc9 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,3 +1,7 @@
+config SND_SOC_FSL_SAI
+       tristate
+       select SND_SOC_GENERIC_DMAENGINE_PCM
+
 config SND_SOC_FSL_SSI
        tristate
 
@@ -197,7 +201,6 @@ config SND_SOC_IMX_SPDIF
        tristate "SoC Audio support for i.MX boards with S/PDIF"
        select SND_SOC_IMX_PCM_DMA
        select SND_SOC_FSL_SPDIF
-       select SND_SOC_SPDIF
        select REGMAP_MMIO
        help
          SoC Audio support for i.MX boards with S/PDIF