diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-11 18:59:04 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-11 18:59:04 -0500 |
| commit | 0526484aa345adbf790d1201a6f5d09be0a648a3 (patch) | |
| tree | 8da37ac2858a960e80dc59ebc4afc460935724f4 /arch/arm/mach-s3c6400/include/mach/dma.h | |
| parent | e0ea8b2c0677e6cc44a0e5b867be48867f91de5b (diff) | |
| parent | aa021baa3295fa6e3f367d80f8955dd5176656eb (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-s3c6400/include/mach/dma.h')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/dma.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/dma.h b/arch/arm/mach-s3c6400/include/mach/dma.h index 1067619f0ba0..6723860748be 100644 --- a/arch/arm/mach-s3c6400/include/mach/dma.h +++ b/arch/arm/mach-s3c6400/include/mach/dma.h | |||
| @@ -58,12 +58,9 @@ enum dma_ch { | |||
| 58 | DMACH_MAX /* the end */ | 58 | DMACH_MAX /* the end */ |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | static __inline__ int s3c_dma_has_circular(void) | 61 | static __inline__ bool s3c_dma_has_circular(void) |
| 62 | { | 62 | { |
| 63 | /* we will be supporting ciruclar buffers as soon as we have DMA | 63 | return true; |
| 64 | * engine support. | ||
| 65 | */ | ||
| 66 | return 1; | ||
| 67 | } | 64 | } |
| 68 | 65 | ||
| 69 | #define S3C2410_DMAF_CIRCULAR (1 << 0) | 66 | #define S3C2410_DMAF_CIRCULAR (1 << 0) |