Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Laurent,

On Fri, 10 Apr 2015 15:45:11 +0300 Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> wrote:
>
> On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote:
> > Hi Mauro,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error:
> > linux/amba/xilinx_dma.h: No such file or directory #include
> > <linux/amba/xilinx_dma.h>
> >                                    ^
> > 
> > Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
> > IP core").
> > 
> > I have reverted that commit (and the 2 following it) for today.
> 
> linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by
> 
> commit 937abe88aea3161cd3a563e577fc9cf4522c7aad
> Author: Kedareswara rao Appana <appana.durga.rao@xxxxxxxxxx>
> Date:   Mon Mar 2 23:24:24 2015 +0530
> 
>     dmaengine: xilinx-dma: move header file to common location
>     
>     This patch moves the xilinx_dma.h header file
>     to the include/linux/dma.
>     
>     Signed-off-by: Kedareswara rao Appana <appanad@xxxxxxxxxx>
>     Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
> 
> Could you update the path instead of reverting the commits ?

I applied this:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 13 Apr 2015 12:48:27 +1000
Subject: [PATCH] v4l: xilinx: fix for include file movement

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/media/platform/xilinx/xilinx-dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 10209c294168..efde88adf624 100644
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -12,7 +12,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/amba/xilinx_dma.h>
+#include <linux/dma/xilinx_dma.h>
 #include <linux/lcm.h>
 #include <linux/list.h>
 #include <linux/module.h>
-- 
2.1.4


Someone needs to tell Linus when the merge happens.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp5V0cOSjRoz.pgp
Description: OpenPGP digital signature