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 branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
rk322x.dtsi
diff --git
a/arch/arm/boot/dts/rk322x.dtsi
b/arch/arm/boot/dts/rk322x.dtsi
index 9d3aee5abc1585fa7cf7b88c45842aa1147abab9..9dff8221112c24287133c5af851a46dae1f36277 100644
(file)
--- a/
arch/arm/boot/dts/rk322x.dtsi
+++ b/
arch/arm/boot/dts/rk322x.dtsi
@@
-443,7
+443,7
@@
#address-cells = <0>;
reg = <0x32011000 0x1000>,
- <0x32012000 0x
1
000>,
+ <0x32012000 0x
2
000>,
<0x32014000 0x2000>,
<0x32016000 0x2000>;
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;