git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-s3c24xx
/
dma.c
diff --git
a/arch/arm/plat-s3c24xx/dma.c
b/arch/arm/plat-s3c24xx/dma.c
index f0ea7943ac5a0fffca6007393daf2120b3e1bb23..93827b3d4e84645bbc34212578140978f7014642 100644
(file)
--- a/
arch/arm/plat-s3c24xx/dma.c
+++ b/
arch/arm/plat-s3c24xx/dma.c
@@
-33,7
+33,7
@@
#include <mach/dma.h>
#include <mach/map.h>
-#include <plat/dma-
plat
.h>
+#include <plat/dma-
s3c24xx
.h>
#include <plat/regs-dma.h>
/* io map for dma */