lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the slave-dma tree with Linus' tree
Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/amba-pl08x.c between commit 4d66164e997e ("dmaengine: PL08x:
Fix trivial build error") from Linus' tree and commit 0c38d7013913
("dmaengine/amba-pl08x: Rearrange inclusion of header files in ascending
order") from the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/dma/amba-pl08x.c
index be21e3f,849eab8..0000000
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@@ -77,17 -72,16 +72,17 @@@
#include <linux/amba/bus.h>
#include <linux/amba/pl08x.h>
#include <linux/debugfs.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dmapool.h>
++#include <linux/dma-mapping.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ #include <linux/pm_runtime.h>
#include <linux/seq_file.h>
+ #include <linux/slab.h>
#include <asm/hardware/pl080.h>

#define DRIVER_NAME "pl08xdmac"


\
 
 \ /
  Last update: 2011-08-26 03:49    [from the cache]
©2003-2011 Jasper Spaans