On 04/22/2014 09:46 PM, Lars-Peter Clausen wrote:
> Commit 0406a40a0 ("ASoC: jz4740: Use the generic dmaengine PCM driver")
> jz4740-pcm.c file, but neglected to remove the Makefile entries.
>
> Fixes: 0406a40a0 ("ASoC: jz4740: Use the generic dmaengine PCM driver")
> Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
> Reported-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
> ---
> sound/soc/jz4740/Makefile | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/sound/soc/jz4740/Makefile b/sound/soc/jz4740/Makefile
> index be873c1..d32c540 100644
> --- a/sound/soc/jz4740/Makefile
> +++ b/sound/soc/jz4740/Makefile
> @@ -1,10 +1,8 @@
> #
> # Jz4740 Platform Support
> #
> -snd-soc-jz4740-objs := jz4740-pcm.o
> snd-soc-jz4740-i2s-objs := jz4740-i2s.o
>
> -obj-$(CONFIG_SND_JZ4740_SOC) += snd-soc-jz4740.o
> obj-$(CONFIG_SND_JZ4740_SOC_I2S) += snd-soc-jz4740-i2s.o
>
> # Jz4740 Machine Support
>
Hi,
This patch (eebdec044e82) is present in 3.15-rc1 but the build failure
that was introduced by 0406a40a0 ("ASoC: jz4740: Use the generic
dmaengine PCM driver") is present in 3.14-rc1 so 3.14 is still broken.
Greg, would it be possible to cherry pick eebdec044e82 ("ASoC: jz4740:
Remove Makefile entry for removed file") to 3.14 stable branch? It seems
to apply without conflicts.
Thank you
--
markos
