diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:57:38 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:57:38 +0200 |
commit | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch) | |
tree | cbc0254ef952f10e99e384b56ccc7b81389e335e /arch/arm/mach-s3c64xx/include | |
parent | Merge branch 'next/topic-exynos4-devel' into next-samsung-devel (diff) | |
parent | Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung (diff) | |
download | linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.xz linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.zip |
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s3c64xx/include')
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/dma.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/dma.h b/arch/arm/mach-s3c64xx/include/mach/dma.h index 0a5d9268a23e..fe1a98cf0e4c 100644 --- a/arch/arm/mach-s3c64xx/include/mach/dma.h +++ b/arch/arm/mach-s3c64xx/include/mach/dma.h @@ -58,11 +58,15 @@ enum dma_ch { DMACH_MAX /* the end */ }; -static __inline__ bool s3c_dma_has_circular(void) +static inline bool samsung_dma_has_circular(void) { return true; } +static inline bool samsung_dma_is_dmadev(void) +{ + return false; +} #define S3C2410_DMAF_CIRCULAR (1 << 0) #include <plat/dma.h> @@ -95,7 +99,7 @@ struct s3c2410_dma_chan { unsigned char peripheral; unsigned int flags; - enum s3c2410_dmasrc source; + enum dma_data_direction source; dma_addr_t dev_addr; |