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 tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
dma.c
diff --git
a/arch/arm/mach-ep93xx/dma.c
b/arch/arm/mach-ep93xx/dma.c
index 88a4c9b089a559c07d6d0d6c2e7159438d036351..821427107b11275a35fa36702ce23d4833b48837 100644
(file)
--- a/
arch/arm/mach-ep93xx/dma.c
+++ b/
arch/arm/mach-ep93xx/dma.c
@@
-26,7
+26,7
@@
#include <linux/platform_device.h>
#include <linux/platform_data/dma-ep93xx.h>
-#include
<mach/hardware.h>
+#include
"hardware.h"
#include "soc.h"