| From 4f0502400a61a53dc0fb0bb73a15a45eb6eb2605 Mon Sep 17 00:00:00 2001 |
| From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Date: Thu, 6 Jun 2013 17:37:14 +0200 |
| Subject: DMA: shdma: shdma_chan_filter() has to be in shdma-base.h |
| |
| shdma_chan_filter() is a function, provided by the shdma-base.c module, |
| move its declaration to the appropriate header. |
| |
| Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> |
| Signed-off-by: Vinod Koul <vinod.koul@intel.com> |
| (cherry picked from commit d0951a23383d09276f7976ed34d8f1cede629b48) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| include/linux/sh_dma.h | 2 -- |
| include/linux/shdma-base.h | 1 + |
| 2 files changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h |
| index b64d6bec..4e83f3e0 100644 |
| --- a/include/linux/sh_dma.h |
| +++ b/include/linux/sh_dma.h |
| @@ -99,6 +99,4 @@ struct sh_dmae_pdata { |
| #define CHCR_TE 0x00000002 |
| #define CHCR_IE 0x00000004 |
| |
| -bool shdma_chan_filter(struct dma_chan *chan, void *arg); |
| - |
| #endif |
| diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h |
| index a3728bf6..9a938971 100644 |
| --- a/include/linux/shdma-base.h |
| +++ b/include/linux/shdma-base.h |
| @@ -122,5 +122,6 @@ void shdma_chan_remove(struct shdma_chan *schan); |
| int shdma_init(struct device *dev, struct shdma_dev *sdev, |
| int chan_num); |
| void shdma_cleanup(struct shdma_dev *sdev); |
| +bool shdma_chan_filter(struct dma_chan *chan, void *arg); |
| |
| #endif |
| -- |
| 1.8.4.3.gca3854a |
| |
