diff -Nur linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h linux-3.10.30/sound/soc/fsl/imx-pcm.h
--- linux-3.10.30.orig/sound/soc/fsl/imx-pcm.h	2014-05-16 15:37:16.208483825 +0200
+++ linux-3.10.30/sound/soc/fsl/imx-pcm.h	2014-05-16 15:39:24.369237997 +0200
@@ -36,7 +36,7 @@
 		dma_data->peripheral_type = IMX_DMATYPE_SSI;
 }
 
-#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
 int imx_pcm_dma_init(struct platform_device *pdev, unsigned int flags, size_t size);
 void imx_pcm_dma_exit(struct platform_device *pdev);
 #else
@@ -51,7 +51,7 @@
 }
 #endif
 
-#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
 int imx_pcm_fiq_init(struct platform_device *pdev);
 void imx_pcm_fiq_exit(struct platform_device *pdev);
 #else
diff -Nur linux-3.10.30.orig/sound/soc/fsl/Kconfig linux-3.10.30/sound/soc/fsl/Kconfig
--- linux-3.10.30.orig/sound/soc/fsl/Kconfig	2014-05-16 15:37:16.208483825 +0200
+++ linux-3.10.30/sound/soc/fsl/Kconfig	2014-05-16 15:37:59.632739735 +0200
@@ -121,15 +121,15 @@
 	tristate
 
 config SND_SOC_IMX_PCM_FIQ
-	bool
+	tristate
 	select FIQ
 
 config SND_SOC_IMX_PCM_DMA
-	bool
+	tristate
 	select SND_SOC_GENERIC_DMAENGINE_PCM
 
 config SND_SOC_IMX_HDMI_DMA
-	bool
+	tristate
 	select SND_SOC_GENERIC_DMAENGINE_PCM
 	select SND_SOC_IMX_PCM_DMA