raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-15 22:41:38 +00:00
Code Issues Projects Releases Wiki Activity

ARM: Merge fixes-s3c64xx-dma

Browse Source 
Merge branch 'fixes-s3c64xx-dma' into fixes-s3c-2632-rc5
This commit is contained in:
Ben Dooks
2009-10-28 18:34:25 +00:00
parent 8e8821e5bb e3d8024891
commit fe4b83c4b6
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-s3c2410/include/mach/dma.h
View File

@@ -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 */

5
arch/arm/mach-s3c6400/include/mach/dma.h
View File

@@ -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 */