Re: linux-next: build failure after merge of the slave-dma tree

[Zhangfei Gao]

On Thu, 2012-06-21 at 22:01 -0700, Vinod Koul wrote:
> On Fri, 2012-06-22 at 13:00 +1000, Stephen Rothwell wrote:
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/dma/mmp_tdma.c:21:27: fatal error: mach/regs-icu.h: No such file or directory
> > 
> > Caused by commit c6da0ba8dfc8 ("dmaengine: mmp_tdma: add mmp tdma
> > support").
> > 
> > I have used the slave-dma tree from next-20120621 for today.
> Thanks Stephen,
> 
> It should not build for this target!. I will added the below patch to
> fix the failure
> 
> >From 0efc8562577cd6a022b8b42d58fcf58ffc2a91d3 Mon Sep 17 00:00:00 2001
> From: Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx>
> Date: Fri, 22 Jun 2012 10:29:53 +0530
> Subject: [PATCH] dmaengine: mmp_tdma: fix the arch dependency
> 
> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx>
> ---
>  drivers/dma/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index 90fec0e..d45cf1b 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -276,7 +276,7 @@ config DMA_SA11X0
>  
>  config MMP_TDMA
>  	bool "MMP Two-Channel DMA support"
> -	default ARCH_MMP
> +	depends on ARCH_MMP
>  	select DMA_ENGINE
>  	help
>  	  Support the MMP Two-Channel DMA engine.
> -- 
> 1.7.0.4
> 

Thanks Vinod and Stephen, sorry for the trouble.
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/