diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:57:38 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 13:57:38 +0400 |
| commit | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch) | |
| tree | cbc0254ef952f10e99e384b56ccc7b81389e335e /arch/arm/mach-s5pv210/include | |
| parent | 7d84b3e93757fe871d57b43c422b81cc8b94057a (diff) | |
| parent | c9312209aa9fdef05b03d63bbead63bb720fd133 (diff) | |
| download | linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.xz | |
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/mach-s5pv210/include')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/dma.h b/arch/arm/mach-s5pv210/include/mach/dma.h index 81209eb1409b..201842a3769e 100644 --- a/arch/arm/mach-s5pv210/include/mach/dma.h +++ b/arch/arm/mach-s5pv210/include/mach/dma.h @@ -20,7 +20,7 @@ #ifndef __MACH_DMA_H #define __MACH_DMA_H -/* This platform uses the common S3C DMA API driver for PL330 */ -#include <plat/s3c-dma-pl330.h> +/* This platform uses the common DMA API driver for PL330 */ +#include <plat/dma-pl330.h> #endif /* __MACH_DMA_H */ |