projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
plat-s3c24xx
/
dma.c
diff --git
a/arch/arm/plat-s3c24xx/dma.c
b/arch/arm/plat-s3c24xx/dma.c
index d6344461a83bb13494e41c72f9667de66ee3a47b..1baf941d1930b76e94b58b23464e5d71da00ab8d 100644
(file)
--- a/
arch/arm/plat-s3c24xx/dma.c
+++ b/
arch/arm/plat-s3c24xx/dma.c
@@
-36,7
+36,7
@@
#include <asm/mach/dma.h>
#include <mach/map.h>
-#include <
asm/plat-s3c24xx
/dma.h>
+#include <
plat
/dma.h>
/* io map for dma */
static void __iomem *dma_base;