aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2443
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-02-22 23:38:26 +0000
committerBen Dooks <ben-linux@fluff.org>2010-02-22 23:38:26 +0000
commit7f0ff702cdf51472750f4b6042866f1b83a11215 (patch)
tree15ce32849cfb8ff3c7205e97a5f76051c08058b0 /arch/arm/mach-s3c2443
parentd35b7a829a13b69c4747b69380b504b6544a2375 (diff)
parent110d85acd479b80dc11b7fa3abef63285da8ea0c (diff)
downloadkernel_samsung_aries-7f0ff702cdf51472750f4b6042866f1b83a11215.zip
kernel_samsung_aries-7f0ff702cdf51472750f4b6042866f1b83a11215.tar.gz
kernel_samsung_aries-7f0ff702cdf51472750f4b6042866f1b83a11215.tar.bz2
ARM: Merge next-samsung-s3c64xx-platdeletion
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed)
Diffstat (limited to 'arch/arm/mach-s3c2443')
-rw-r--r--arch/arm/mach-s3c2443/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c
index 397f3b5..3f65868 100644
--- a/arch/arm/mach-s3c2443/dma.c
+++ b/arch/arm/mach-s3c2443/dma.c
@@ -20,7 +20,7 @@
#include <mach/dma.h>
-#include <plat/dma-plat.h>
+#include <plat/dma-s3c24xx.h>
#include <plat/cpu.h>
#include <plat/regs-serial.h>