projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[cascardo/linux.git]
/
arch
/
mips
/
netlogic
/
dts
/
xlp_gvp.dts
diff --git
a/arch/mips/netlogic/dts/xlp_gvp.dts
b/arch/mips/netlogic/dts/xlp_gvp.dts
index
047d27f
..
bb4ecd1
100644
(file)
--- a/
arch/mips/netlogic/dts/xlp_gvp.dts
+++ b/
arch/mips/netlogic/dts/xlp_gvp.dts
@@
-26,11
+26,12
@@
interrupt-parent = <&pic>;
interrupts = <17>;
};
interrupt-parent = <&pic>;
interrupts = <17>;
};
- pic: pic@
4
000 {
-
interrupt-controller
;
+ pic: pic@
110
000 {
+
compatible = "netlogic,xlp-pic"
;
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <0 0x110000 0x200>;
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <0 0x110000 0x200>;
+ interrupt-controller;
};
nor_flash@1,0 {
};
nor_flash@1,0 {