diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /arch/arm/mach-s3c2440/dma.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-s3c2440/dma.c')
| -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 5b5ee0b8f4e0..69b6cf34df47 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <mach/regs-mem.h> | 28 | #include <mach/regs-mem.h> |
| 29 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
| 30 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
| 31 | #include <asm/plat-s3c24xx/regs-iis.h> | 31 | #include <plat/regs-iis.h> |
| 32 | #include <plat/regs-spi.h> | 32 | #include <plat/regs-spi.h> |
| 33 | 33 | ||
| 34 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { | 34 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { |