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
/
boot
/
dts
/
alpine.dtsi
diff --git
a/arch/arm/boot/dts/alpine.dtsi
b/arch/arm/boot/dts/alpine.dtsi
index d3036ea823d1a4c94d07177ba66d2eb21991140a..3b0675a1c46073d4a7c0c6f579609901dd0aaa74 100644
(file)
--- a/
arch/arm/boot/dts/alpine.dtsi
+++ b/
arch/arm/boot/dts/alpine.dtsi
@@
-91,7
+91,7
@@
};
/* Interrupt Controller */
- gic:
gic
@fb001000 {
+ gic:
interrupt-controller
@fb001000 {
compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>;
#size-cells = <0>;