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/dra7-evm.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/dra7-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts index 746cddb1b8f5..789ee58ba47e 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -446,7 +446,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&uart1_pins>; - interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, + interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, <&dra7_pmx_core 0x3e0>; }; |