diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 12:34:49 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 12:34:49 +0000 |
commit | ebfa200c1c2d8a0a0634ebd7a24123f9a0404a5c (patch) | |
tree | 43d56e5f04108cd9768a87b95df85db3bc3659ca /arch/arm/mach-s3c2443 | |
parent | 2231b3729eb92f163bbe64b604410ee451b2c42b (diff) | |
parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) |
Merge branch 's3c-moves2' into s3c64xx
Diffstat (limited to 'arch/arm/mach-s3c2443')
-rw-r--r-- | arch/arm/mach-s3c2443/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c index f73ccb25ff9..872482f0268 100644 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c @@ -26,12 +26,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, \ |