linux-kernel - Fix patch for the merge of the v4l-dvb and slave-dma trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Sat, 25 Apr 2015 18:29:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus <torvalds@...ux-foundation.org>
Cc:	Mauro Carvalho Chehab <mchehab@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hyun Kwon <hyun.kwon@...inx.com>,
	Radhey Shyam Pandey <radheys@...inx.com>,
	Michal Simek <michal.simek@...inx.com>,
	Hans Verkuil <hans.verkuil@...co.com>,
	Vinod Koul <vinod.koul@...el.com>
Subject: Fix patch for the merge of the v4l-dvb and slave-dma trees

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@...b.auug.org.au>
Date: Mon, 13 Apr 2015 12:48:27 +1000
Subject: [PATCH] v4l: xilinx: fix for include file movement

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped