linux-next: manual merge of the moduleh tree with the slave-dmatree

From: Stephen Rothwell
Date: Mon Aug 08 2011 - 22:56:36 EST

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
include/linux/dmaengine.h between commit 90b44f8ffdf6 ("dmaengine: add
helper function for slave_single") from the slave-dma tree and commit
0719989d364d ("linux/dmaengine.h needs bitmap.h and asm/page.h") from the
moduleh tree.

Just context changes. I fixed it up (see below) and can carry the fix as

Vinod, that slave-dma tree patch should probably remove the bare "struct
scallerlist;" since it now includes scatterlist,h.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/dmaengine.h
index 0d738c9,1ceff5a..0000000
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -24,7 -24,8 +24,9 @@@
#include <linux/device.h>
#include <linux/uio.h>
#include <linux/dma-direction.h>
+#include <linux/scatterlist.h>
+ #include <linux/bitmap.h>
+ #include <asm/page.h>

struct scatterlist;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at