Patchwork dmaengine: PL08x: Fix trivial build error

login
register
mail settings
Submitter Russell King - ARM Linux
Date Aug. 6, 2011, 8:40 a.m.
Message ID <E1QpcR1-00013t-Sj@rmk-PC.arm.linux.org.uk>
Download mbox | patch
Permalink /patch/108764/
State New
Headers show

Comments

Russell King - ARM Linux - Aug. 6, 2011, 8:40 a.m.
Something changed during the 3.1 merge window in the include files
which now causes the pl08x DMA engine driver to fail to build.  Fix
this by adding the now necessary dma-mapping.h include:

drivers/dma/amba-pl08x.c: In function ■pl08x_unmap_buffers■:
drivers/dma/amba-pl08x.c:1524: error: implicit declaration of function ■dma_unmap_single■
drivers/dma/amba-pl08x.c:1527: error: implicit declaration of function ■dma_unmap_page■

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
If you can provide an ack, and I'll push this through my pending
'fixes' merge.

 drivers/dma/amba-pl08x.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Koul, Vinod - Aug. 8, 2011, 4:37 a.m.
On Sat, 2011-08-06 at 09:40 +0100, Russell King - ARM Linux wrote:
> Something changed during the 3.1 merge window in the include files
> which now causes the pl08x DMA engine driver to fail to build.  Fix
> this by adding the now necessary dma-mapping.h include:
> 
> drivers/dma/amba-pl08x.c: In function ■pl08x_unmap_buffers■:
> drivers/dma/amba-pl08x.c:1524: error: implicit declaration of function ■dma_unmap_single■
> drivers/dma/amba-pl08x.c:1527: error: implicit declaration of function ■dma_unmap_page■
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
> If you can provide an ack, and I'll push this through my pending
> 'fixes' merge.
Sure...
Acked-by: Vinod Koul <vinod.koul@intel.com>
> 
>  drivers/dma/amba-pl08x.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
> index 196a737..be21e3f 100644
> --- a/drivers/dma/amba-pl08x.c
> +++ b/drivers/dma/amba-pl08x.c
> @@ -80,6 +80,7 @@
>  #include <linux/interrupt.h>
>  #include <linux/slab.h>
>  #include <linux/delay.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/dmapool.h>
>  #include <linux/dmaengine.h>
>  #include <linux/amba/bus.h>
Linus Walleij - Aug. 8, 2011, 11:42 a.m.
2011/8/6 Russell King - ARM Linux <linux@arm.linux.org.uk>:

> Something changed during the 3.1 merge window in the include files
> which now causes the pl08x DMA engine driver to fail to build.  Fix
> this by adding the now necessary dma-mapping.h include:
>
> drivers/dma/amba-pl08x.c: In function ■pl08x_unmap_buffers■:
> drivers/dma/amba-pl08x.c:1524: error: implicit declaration of function ■dma_unmap_single■
> drivers/dma/amba-pl08x.c:1527: error: implicit declaration of function ■dma_unmap_page■
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
> If you can provide an ack, and I'll push this through my pending
> 'fixes' merge.

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Linus Walleij

Patch

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 196a737..be21e3f 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -80,6 +80,7 @@ 
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/dmaengine.h>
 #include <linux/amba/bus.h>