diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 18:38:26 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 18:38:26 -0500 |
| commit | 7f0ff702cdf51472750f4b6042866f1b83a11215 (patch) | |
| tree | 15ce32849cfb8ff3c7205e97a5f76051c08058b0 /arch/arm/mach-s3c2440 | |
| parent | d35b7a829a13b69c4747b69380b504b6544a2375 (diff) | |
| parent | 110d85acd479b80dc11b7fa3abef63285da8ea0c (diff) | |
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-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index e08e081430f0..3b0529f54e9c 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <mach/map.h> | 20 | #include <mach/map.h> |
| 21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 22 | 22 | ||
| 23 | #include <plat/dma-plat.h> | 23 | #include <plat/dma-s3c24xx.h> |
| 24 | #include <plat/cpu.h> | 24 | #include <plat/cpu.h> |
| 25 | 25 | ||
| 26 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |