| From 7f472b5f26b7ca5024aa78e636ecce48c03c3dc2 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Fri, 29 Jul 2011 16:55:11 +1000 |
| Subject: linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h |
| |
| The implicit presence of module.h and all its sub-includes was |
| masking these implicit header usages: |
| |
| include/linux/dmaengine.h:684: warning: 'struct page' declared inside parameter list |
| include/linux/dmaengine.h:684: warning: its scope is only this definition or declaration, which is probably not what you want |
| include/linux/dmaengine.h:687: warning: 'struct page' declared inside parameter list |
| include/linux/dmaengine.h:736:2: error: implicit declaration of function 'bitmap_zero' |
| |
| With input from Stephen Rothwell <sfr@canb.auug.org.au> |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| (cherry picked from commit a8efa9d6bf00fbe9597dd3352dc062a998bf9b15) |
| |
| Conflicts: |
| |
| include/linux/dmaengine.h |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| include/linux/dmaengine.h | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h |
| index 7a51acb..79d6881 100644 |
| --- a/include/linux/dmaengine.h |
| +++ b/include/linux/dmaengine.h |
| @@ -25,6 +25,10 @@ |
| #include <linux/uio.h> |
| #include <linux/dma-mapping.h> |
| #include <linux/scatterlist.h> |
| +#include <linux/bitmap.h> |
| +#include <asm/page.h> |
| + |
| +struct scatterlist; |
| |
| /** |
| * typedef dma_cookie_t - an opaque DMA cookie |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
