diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-03 00:40:15 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-03 00:40:15 +0100 |
| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/plat-s3c24xx/dma.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff) | |
| parent | ARM: S3C64XX: Add initial support for board specific IRQs (diff) | |
| download | linux-882d01f96bc1909455696aae6eb7ce4df3e908c8.tar.xz linux-882d01f96bc1909455696aae6eb7ce4df3e908c8.zip | |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/plat-s3c24xx/dma.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index f0ea7943ac5a..93827b3d4e84 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@ -33,7 +33,7 @@ #include <mach/dma.h> #include <mach/map.h> -#include <plat/dma-plat.h> +#include <plat/dma-s3c24xx.h> #include <plat/regs-dma.h> /* io map for dma */ |