diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-16 22:46:19 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-16 22:46:19 -0800 |
| commit | 090e648a20a43d71fc2d63e0d8ff8ec6822e2396 (patch) | |
| tree | bc8f67d9c5b0de5a20b251e4fd1f411cc8277deb /arch/arm/plat-samsung/include/plat/dma-ops.h | |
| parent | 8b0f6d12de91345190f234edba781b2fd03257b6 (diff) | |
| parent | 815ed6fc0a4d82bb39ed43d230c4e516214987e7 (diff) | |
Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
ARM: S3C64XX: Remove hsmmc1 from Cragganmore
ARM: S3C64XX: Remove unconditional power domain disables
ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
ARM: SAMSUNG: dma-ops.h needs mach/dma.h
ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/dma-ops.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-ops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index 22eafc310bd7..7c6c2a8dd552 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h @@ -14,6 +14,7 @@ #define __SAMSUNG_DMA_OPS_H_ __FILE__ #include <linux/dmaengine.h> +#include <mach/dma.h> struct samsung_dma_prep_info { enum dma_transaction_type cap; |