diff options
author | Dong Aisheng <b29396@freescale.com> | 2011-07-12 23:40:54 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-15 04:45:28 -0400 |
commit | d3144df5bd8eb1c8137cc92989e2e6bc9f2e5a27 (patch) | |
tree | 32746346189ae7647b50b405cd2d4e31771695c7 /arch/arm/mach-mxs/include/mach/dma.h | |
parent | 9e32be11f3844b534310dfc9db00bcffb38ccdd9 (diff) |
ARM: mxs-dma: include <linux/dmaengine.h>
Other files using dma.h may fail to compile as follows:
In file included from sound/soc/mxs/mxs-pcm.h:22,
from sound/soc/mxs/mxs-saif.h:112,
from sound/soc/mxs/mxs-sgtl5000.c:34:
arch/arm/mach-mxs/include/mach/dma.h:16: warning: 'struct dma_chan' declared inside parameter list
arch/arm/mach-mxs/include/mach/dma.h:16: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/mach-mxs/include/mach/dma.h: In function 'mxs_dma_is_apbh':
arch/arm/mach-mxs/include/mach/dma.h:18: error: dereferencing pointer to incomplete type
arch/arm/mach-mxs/include/mach/dma.h: At top level:
arch/arm/mach-mxs/include/mach/dma.h:21: warning: 'struct dma_chan' declared inside parameter list
arch/arm/mach-mxs/include/mach/dma.h: In function 'mxs_dma_is_apbx':
arch/arm/mach-mxs/include/mach/dma.h:23: error: dereferencing pointer to incomplete type
make[3]: *** [sound/soc/mxs/mxs-sgtl5000.o] Error 1
make[2]: *** [sound/soc/mxs] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
It seems it's better for dma.h to include dmaengine.h himself.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/dma.h')
-rw-r--r-- | arch/arm/mach-mxs/include/mach/dma.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/arch/arm/mach-mxs/include/mach/dma.h index 7f4aeeaba8df..203d7c4a3e11 100644 --- a/arch/arm/mach-mxs/include/mach/dma.h +++ b/arch/arm/mach-mxs/include/mach/dma.h | |||
@@ -9,6 +9,8 @@ | |||
9 | #ifndef __MACH_MXS_DMA_H__ | 9 | #ifndef __MACH_MXS_DMA_H__ |
10 | #define __MACH_MXS_DMA_H__ | 10 | #define __MACH_MXS_DMA_H__ |
11 | 11 | ||
12 | #include <linux/dmaengine.h> | ||
13 | |||
12 | struct mxs_dma_data { | 14 | struct mxs_dma_data { |
13 | int chan_irq; | 15 | int chan_irq; |
14 | }; | 16 | }; |