aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2443
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 19:35:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 19:35:07 +0000
commitfba670013d538719d13f103b2a5b4b06bdca202b (patch)
treef7b97d71161a17619e0ba92ffbef5ec2e7823776 /arch/arm/mach-s3c2443
parent7577fdfa52438a19e7e8abedb6efc645986af2ae (diff)
parente856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff)
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/mach-s3c2443')
-rw-r--r--arch/arm/mach-s3c2443/dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c
index 2a685ce22ee..2a58a4d5aa5 100644
--- a/arch/arm/mach-s3c2443/dma.c
+++ b/arch/arm/mach-s3c2443/dma.c
@@ -25,12 +25,12 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
-#include <asm/plat-s3c/regs-ac97.h>
+#include <plat/regs-ac97.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
-#include <asm/plat-s3c24xx/regs-spi.h>
+#include <plat/regs-spi.h>
#define MAP(x) { \
[0] = (x) | DMA_CH_VALID, \