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-iop13xx
/
tpmi.c
diff --git
a/arch/arm/mach-iop13xx/tpmi.c
b/arch/arm/mach-iop13xx/tpmi.c
index 116feb6b261eb7b0e08ee7ce248e44682e537898..d3d8c78e7d1087e42bb2abab459df0967eb6546f 100644
(file)
--- a/
arch/arm/mach-iop13xx/tpmi.c
+++ b/
arch/arm/mach-iop13xx/tpmi.c
@@
-23,7
+23,7
@@
#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <asm/irq.h>
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include <mach/irqs.h>
/* assumes CONTROLLER_ONLY# is never asserted in the ESSR register */