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

From: Laurent Pinchart
Date: Fri Apr 10 2015 - 08:44:51 EST


Hi Stephen,

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 ?

--
Regards,

Laurent Pinchart

--
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/