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 commit 'v3.15' into next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am33xx.dtsi
diff --git
a/arch/arm/boot/dts/am33xx.dtsi
b/arch/arm/boot/dts/am33xx.dtsi
index cb6811e5ae5a9a148321d4e667dc34cde9bc9846..7ad75b4e066358f5229d93d0d017c754a711ca32 100644
(file)
--- a/
arch/arm/boot/dts/am33xx.dtsi
+++ b/
arch/arm/boot/dts/am33xx.dtsi
@@
-144,7
+144,7
@@
compatible = "ti,edma3";
ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
reg = <0x49000000 0x10000>,
- <0x44e10f90 0x
1
0>;
+ <0x44e10f90 0x
4
0>;
interrupts = <12 13 14>;
#dma-cells = <1>;
dma-channels = <64>;
git.samba.org / sfrench / cifs-2.6.git / blobdiff