diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 15:56:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 15:56:37 -0400 |
| commit | 62778396020a29d742abf980c1e83f3df4b5426e (patch) | |
| tree | 08dc01019a1afe6ed16ab79c627ecd81caea52e0 /arch/arm/mach-mxs | |
| parent | 58f45e3c6f4fd2b9b9d7d43af71409a79a4b4cf6 (diff) | |
| parent | d3144df5bd8eb1c8137cc92989e2e6bc9f2e5a27 (diff) | |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
Diffstat (limited to 'arch/arm/mach-mxs')
| -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 | }; |