diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-10-28 18:34:25 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-10-28 18:34:25 +0000 |
| commit | fe4b83c4b6346fff28f4f10f34e1aca3f719d68c (patch) | |
| tree | cd925e7b306ef9ef4d4ee9c17e13c377428d6269 /arch/arm | |
| parent | 8e8821e5bbcfb177d1b00aa9888a85bc7d6bf3ae (diff) | |
| parent | e3d8024891dbfec6cf36c9b76177650f48118462 (diff) | |
ARM: Merge fixes-s3c64xx-dma
Merge branch 'fixes-s3c64xx-dma' into fixes-s3c-2632-rc5
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/dma.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/dma.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h index c3a2629e0de..92e2687009e 100644 --- a/arch/arm/mach-s3c2410/include/mach/dma.h +++ b/arch/arm/mach-s3c2410/include/mach/dma.h @@ -110,6 +110,8 @@ enum s3c2410_dma_loadst { * waiting for reloads */ #define S3C2410_DMAF_AUTOSTART (1<<1) /* auto-start if buffer queued */ +#define S3C2410_DMAF_CIRCULAR (1 << 2) /* no circular dma support */ + /* dma buffer */ struct s3c2410_dma_buf; @@ -194,4 +196,9 @@ struct s3c2410_dma_chan { typedef unsigned long dma_device_t; +static inline bool s3c_dma_has_circular(void) +{ + return false; +} + #endif /* __ASM_ARCH_DMA_H */ diff --git a/arch/arm/mach-s3c6400/include/mach/dma.h b/arch/arm/mach-s3c6400/include/mach/dma.h index 1067619f0ba..004edab2395 100644 --- a/arch/arm/mach-s3c6400/include/mach/dma.h +++ b/arch/arm/mach-s3c6400/include/mach/dma.h @@ -68,6 +68,11 @@ static __inline__ int s3c_dma_has_circular(void) #define S3C2410_DMAF_CIRCULAR (1 << 0) +static inline bool s3c_dma_has_circular(void) +{ + return false; +} + #include <plat/dma.h> #endif /* __ASM_ARCH_IRQ_H */ |