From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus <torvalds@linux-foundation•org>
Cc: Mauro Carvalho Chehab <mchehab@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Hyun Kwon <hyun.kwon@xilinx•com>,
Radhey Shyam Pandey <radheys@xilinx•com>,
Michal Simek <michal.simek@xilinx•com>,
Hans Verkuil <hans.verkuil@cisco•com>,
Vinod Koul <vinod.koul@intel•com>
Subject: Fix patch for the merge of the v4l-dvb and slave-dma trees
Date: Sat, 25 Apr 2015 18:29:54 +1000 [thread overview]
Message-ID: <20150425182954.388f5569@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]
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@canb•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@canb•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@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-04-25 8:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150425182954.388f5569@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hans.verkuil@cisco$(echo .)com \
--cc=hyun.kwon@xilinx$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
--cc=michal.simek@xilinx$(echo .)com \
--cc=radheys@xilinx$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=vinod.koul@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox