diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-11 01:57:56 +0300 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-11 01:57:56 +0300 |
| commit | 07c523f1493b6860662e74a3d7e1ae0e7d67d416 (patch) | |
| tree | 8d8edfc4f8ba1c985e1b8ca032beadf04323cc01 /arch/arm/boot/dts/omap5-cm-t54.dts | |
| parent | 37b25fffd1435dd9b77ac5882a6791f7d5691097 (diff) | |
| parent | 7136d457f365ecc93ddffcdd42ab49a8473f260b (diff) | |
| download | linux-07c523f1493b6860662e74a3d7e1ae0e7d67d416.tar.xz | |
Merge branch 'irqchip/stacked-omap' into irqchip/core
Diffstat (limited to 'arch/arm/boot/dts/omap5-cm-t54.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap5-cm-t54.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index b54b271e153b..61ad2ea34720 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -412,7 +412,6 @@ palmas: palmas@48 { compatible = "ti,palmas"; interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* IRQ_SYS_1N */ - interrupt-parent = <&gic>; reg = <0x48>; interrupt-controller; #interrupt-cells = <2>; |