Hi Linus, I have been applying the below merge fix patch for a while now. I neglected to let Vinod know that it was needed after your merge of his tree. 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 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpj7KBU6dyPt.pgp
Description: OpenPGP digital signature
