diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-09-05 08:15:59 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-09-05 08:16:31 -0400 |
| commit | f55bd27d50aa3ee15819e85ca0984a3af33d3c30 (patch) | |
| tree | c2442af31d45db0b9ddd559622a1bc7effbecbb8 /arm-imx-fixsound.patch | |
| parent | 7f84e82fc97765b1ad39b25406fd5179bd65b130 (diff) | |
| download | kernel-f55bd27d50aa3ee15819e85ca0984a3af33d3c30.tar.gz kernel-f55bd27d50aa3ee15819e85ca0984a3af33d3c30.tar.xz kernel-f55bd27d50aa3ee15819e85ca0984a3af33d3c30.zip | |
Linux v3.11-3891-gae7a835
Diffstat (limited to 'arm-imx-fixsound.patch')
| -rw-r--r-- | arm-imx-fixsound.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/arm-imx-fixsound.patch b/arm-imx-fixsound.patch deleted file mode 100644 index cfad652e4..000000000 --- a/arm-imx-fixsound.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 Mon Sep 17 00:00:00 2001 -From: Fabio Estevam <fabio.estevam@freescale.com> -Date: Mon, 29 Jul 2013 21:37:32 +0000 -Subject: ASoC: fsl: Fix module build - -Building imx_v6_v7_defconfig with all audio drivers as modules results in -the folowing build error: - -ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined! -ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined! - -Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also -built as modules and by using 'IS_ENABLED' to cover the module case. - -Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> -Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> -Acked-by: Shawn Guo <shawn.guo@linaro.org> -Signed-off-by: Mark Brown <broonie@linaro.org> ---- -diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig -index 3a79d01..c26449b 100644 ---- a/sound/soc/fsl/Kconfig -+++ b/sound/soc/fsl/Kconfig -@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI - 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_AUDMUX -diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h -index 9136625..5d5b733 100644 ---- a/sound/soc/fsl/imx-pcm.h -+++ b/sound/soc/fsl/imx-pcm.h -@@ -32,7 +32,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); - void imx_pcm_dma_exit(struct platform_device *pdev); - #else -@@ -46,7 +46,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 --- -cgit v0.9.2 |