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-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am43x-epos-evm.dts
diff --git
a/arch/arm/boot/dts/am43x-epos-evm.dts
b/arch/arm/boot/dts/am43x-epos-evm.dts
index 72f01bb5d61c2b757e975419478decafd639211f..795d68af6df9dbcf9b09b71350e7816606f7994a 100644
(file)
--- a/
arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/
arch/arm/boot/dts/am43x-epos-evm.dts
@@
-369,7
+369,6
@@
reg = <0x24>;
compatible = "ti,tps65218";
interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
- interrupt-parent = <&gic>;
interrupt-controller;
#interrupt-cells = <2>;