summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/kirkwood.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-05 07:56:41 +0100
committerOlof Johansson <olof@lixom.net>2013-02-05 07:56:41 +0100
commit469da62096e23adc755c1268b00b5fc7a214151b (patch)
treefefd055fdae584e38d551f44d1339eb22cee4ed9 /arch/arm/boot/dts/kirkwood.dtsi
parentMerge tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2... (diff)
parentLinux 3.8-rc6 (diff)
downloadlinux-469da62096e23adc755c1268b00b5fc7a214151b.tar.xz
linux-469da62096e23adc755c1268b00b5fc7a214151b.zip
Merge tag 'v3.8-rc6' into next/soc
Linux 3.8-rc6
Diffstat (limited to 'arch/arm/boot/dts/kirkwood.dtsi')
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi2
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>;
};