diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 11:32:29 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-18 11:32:29 -0400 |
| commit | bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (patch) | |
| tree | 6a4345fe0f908d60f52085b97818be705c62af8e /arch/arm/mach-s3c2412 | |
| parent | 543899f610799426babb5313682fd9c249e34677 (diff) | |
| parent | 0b13406a1f1928ec71e81dde52cb62d72ffd28ef (diff) | |
[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel
Merge branch 'next-s3c64xx-dma2' into for-rmk-devel
Conflicts:
arch/arm/plat-s3c64xx/Makefile
Diffstat (limited to 'arch/arm/mach-s3c2412')
| -rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 9e3478506c6f..f8d16fc10bc6 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
| @@ -20,12 +20,13 @@ | |||
| 20 | 20 | ||
| 21 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 22 | 22 | ||
| 23 | #include <plat/dma.h> | 23 | #include <plat/dma-plat.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> |
| 27 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
| 28 | #include <plat/regs-ac97.h> | 28 | #include <plat/regs-ac97.h> |
| 29 | #include <plat/regs-dma.h> | ||
| 29 | #include <mach/regs-mem.h> | 30 | #include <mach/regs-mem.h> |
| 30 | #include <mach/regs-lcd.h> | 31 | #include <mach/regs-lcd.h> |
| 31 | #include <mach/regs-sdi.h> | 32 | #include <mach/regs-sdi.h> |