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 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
arm-realview-pb11mp.dts
diff --git
a/arch/arm/boot/dts/arm-realview-pb11mp.dts
b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 36203288de4267d6b41d01375027da7d099b473e..7f9cbdf33a51009ffea23fa488ec8f1e6abe7914 100644
(file)
--- a/
arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/
arch/arm/boot/dts/arm-realview-pb11mp.dts
@@
-523,7
+523,7
@@
clock-names = "uartclk", "apb_pclk";
};
- s
sp
@1000d000 {
+ s
pi
@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
interrupt-parent = <&intc_pb11mp>;