Re: linux-next: manual merge of the moduleh tree with theslave-dma tree

From: Vinod Koul
Date: Tue Aug 09 2011 - 00:42:44 EST


On Tue, 2011-08-09 at 12:56 +1000, Stephen Rothwell wrote:
>
> Vinod, that slave-dma tree patch should probably remove the bare "struct
> scallerlist;" since it now includes scatterlist,h.
>
Yes, makes sense Dan does this look good to you

From: Vinod Koul <vinod.koul@xxxxxxxxx>
Date: Tue, 9 Aug 2011 10:08:10 +0530
Subject: [PATCH] dmaengine: remove struct scatterlist for header

Commit 90b44f8 introduces dmaengine_prep_slave_single API which adds
scatterlist.h in dmaengine.h, so defining struct scatterlist is not
required

Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
---
include/linux/dmaengine.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 0d738c9..ace51af 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -26,8 +26,6 @@
#include <linux/dma-direction.h>
#include <linux/scatterlist.h>

-struct scatterlist;
-
/**
* typedef dma_cookie_t - an opaque DMA cookie
*
--
1.7.0.4




--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/