diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-18 21:26:54 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-18 21:26:54 -0400 |
| commit | 219c8c866ceee3dbfeb1194ce06e9c729f1d379c (patch) | |
| tree | 618b6761caa3316b535ad458d9dff3ee3bc4d86c /arch/arm/mach-s5pc100/include | |
| parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) | |
| parent | 51ddf31da16b1ab9da861eafedad6d263faf4388 (diff) | |
Merge branch 'samsung_dma' of git://git.infradead.org/users/vkoul/slave-dma into next/topic-dma-samsung
Diffstat (limited to 'arch/arm/mach-s5pc100/include')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/dma.h b/arch/arm/mach-s5pc100/include/mach/dma.h index 81209eb1409b..201842a3769e 100644 --- a/arch/arm/mach-s5pc100/include/mach/dma.h +++ b/arch/arm/mach-s5pc100/include/mach/dma.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #ifndef __MACH_DMA_H | 20 | #ifndef __MACH_DMA_H |
| 21 | #define __MACH_DMA_H | 21 | #define __MACH_DMA_H |
| 22 | 22 | ||
| 23 | /* This platform uses the common S3C DMA API driver for PL330 */ | 23 | /* This platform uses the common DMA API driver for PL330 */ |
| 24 | #include <plat/s3c-dma-pl330.h> | 24 | #include <plat/dma-pl330.h> |
| 25 | 25 | ||
| 26 | #endif /* __MACH_DMA_H */ | 26 | #endif /* __MACH_DMA_H */ |