diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/arm/mach-s3c2410/include/mach/dma.h | |
parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/dma.h')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/dma.h | 7 |
1 files changed, 7 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 { | |||
110 | * waiting for reloads */ | 110 | * waiting for reloads */ |
111 | #define S3C2410_DMAF_AUTOSTART (1<<1) /* auto-start if buffer queued */ | 111 | #define S3C2410_DMAF_AUTOSTART (1<<1) /* auto-start if buffer queued */ |
112 | 112 | ||
113 | #define S3C2410_DMAF_CIRCULAR (1 << 2) /* no circular dma support */ | ||
114 | |||
113 | /* dma buffer */ | 115 | /* dma buffer */ |
114 | 116 | ||
115 | struct s3c2410_dma_buf; | 117 | struct s3c2410_dma_buf; |
@@ -194,4 +196,9 @@ struct s3c2410_dma_chan { | |||
194 | 196 | ||
195 | typedef unsigned long dma_device_t; | 197 | typedef unsigned long dma_device_t; |
196 | 198 | ||
199 | static inline bool s3c_dma_has_circular(void) | ||
200 | { | ||
201 | return false; | ||
202 | } | ||
203 | |||
197 | #endif /* __ASM_ARCH_DMA_H */ | 204 | #endif /* __ASM_ARCH_DMA_H */ |