projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-s3c64xx
/
dma.c
diff --git
a/arch/arm/mach-s3c64xx/dma.c
b/arch/arm/mach-s3c64xx/dma.c
index
a77f521
..
6af1aa1
100644
(file)
--- a/
arch/arm/mach-s3c64xx/dma.c
+++ b/
arch/arm/mach-s3c64xx/dma.c
@@
-29,8
+29,7
@@
#include <mach/map.h>
#include <mach/irqs.h>
-#include <mach/regs-sys.h>
-
+#include "regs-sys.h"
/* dma channel state information */