diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /arch/arm/mach-s3c2443/dma.c | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'arch/arm/mach-s3c2443/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c2443/dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c index f73ccb25ff94..2a58a4d5aa5a 100644 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | #include <asm/dma.h> | ||
| 22 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 23 | 22 | ||
| 24 | #include <plat/dma.h> | 23 | #include <plat/dma.h> |
| @@ -26,12 +25,12 @@ | |||
| 26 | 25 | ||
| 27 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
| 28 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
| 29 | #include <asm/plat-s3c/regs-ac97.h> | 28 | #include <plat/regs-ac97.h> |
| 30 | #include <mach/regs-mem.h> | 29 | #include <mach/regs-mem.h> |
| 31 | #include <mach/regs-lcd.h> | 30 | #include <mach/regs-lcd.h> |
| 32 | #include <mach/regs-sdi.h> | 31 | #include <mach/regs-sdi.h> |
| 33 | #include <asm/plat-s3c24xx/regs-iis.h> | 32 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 34 | #include <asm/plat-s3c24xx/regs-spi.h> | 33 | #include <plat/regs-spi.h> |
| 35 | 34 | ||
| 36 | #define MAP(x) { \ | 35 | #define MAP(x) { \ |
| 37 | [0] = (x) | DMA_CH_VALID, \ | 36 | [0] = (x) | DMA_CH_VALID, \ |