Messages in this thread | | | Date | Tue, 9 Aug 2011 12:56:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the slave-dma tree |
| |
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 necessary.
Vinod, that slave-dma tree patch should probably remove the bare "struct scallerlist;" since it now includes scatterlist,h.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
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;
| |