diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 15:51:49 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 15:51:49 +0100 |
commit | 2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb (patch) | |
tree | 4b3bb0f76c15264fe7d4cced91127f3d96ff31f5 /arch/arm/boot/dts/kirkwood.dtsi | |
parent | Merge branch 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | Merge branch 'clocks/broadcast-arm' of git://linux-arm.org/linux-mr into for-... (diff) | |
download | linux-2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb.tar.xz linux-2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb.zip |
Merge branch 'for-rmk/broadcast' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/boot/dts/kirkwood.dtsi')
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 110d6cbb795b..d6ab442b7011 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -36,6 +36,7 @@ reg = <0x10100 0x40>; ngpios = <32>; interrupt-controller; + #interrupt-cells = <2>; interrupts = <35>, <36>, <37>, <38>; }; @@ -46,6 +47,7 @@ reg = <0x10140 0x40>; ngpios = <18>; interrupt-controller; + #interrupt-cells = <2>; interrupts = <39>, <40>, <41>; }; |