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/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
dm814x.dtsi
diff --git
a/arch/arm/boot/dts/dm814x.dtsi
b/arch/arm/boot/dts/dm814x.dtsi
index f23cae0c2179316b39fa7766d3113305c5e54191..68e412c9863cccc8a78aedfc0279c7f44a35c0a1 100644
(file)
--- a/
arch/arm/boot/dts/dm814x.dtsi
+++ b/
arch/arm/boot/dts/dm814x.dtsi
@@
-448,7
+448,7
@@
reg = <0x49000000 0x10000>;
reg-names = "edma3_cc";
interrupts = <12 13 14>;
- interrupt-names = "edma3_ccint", "e
md
a3_mperr",
+ interrupt-names = "edma3_ccint", "e
dm
a3_mperr",
"edma3_ccerrint";
dma-requests = <64>;
#dma-cells = <2>;