Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat...

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

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index aa14fc9744cc3279a78c6619f4e544c20c28a147..d70133086ac330456ec931b74afce38dd36a3b54 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -16,13 +16,8 @@ if SND_POWERPC_SOC
 config SND_MPC52xx_DMA
        tristate
 
-config SND_SOC_FSL_SSI
-       tristate
-       depends on FSL_SOC
-
 config SND_SOC_POWERPC_DMA
        tristate
-       depends on FSL_SOC
 
 config SND_SOC_MPC8610_HPCD
        tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
@@ -116,7 +111,7 @@ config SND_SOC_IMX_AUDMUX
        tristate
 
 config SND_MXC_SOC_WM1133_EV1
-       tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
+       tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
        depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
        select SND_SOC_WM8350
        select SND_SOC_IMX_PCM_FIQ
@@ -176,4 +171,12 @@ config SND_SOC_IMX_SGTL5000
          Say Y if you want to add support for SoC audio on an i.MX board with
          a sgtl5000 codec.
 
+config SND_SOC_IMX_MC13783
+       tristate "SoC Audio support for I.MX boards with mc13783"
+       depends on MFD_MC13783
+       select SND_SOC_IMX_SSI
+       select SND_SOC_IMX_AUDMUX
+       select SND_SOC_MC13783
+       select SND_SOC_IMX_PCM_DMA
+
 endif # SND_IMX_SOC