diff options
author | Olof Johansson <olof@lixom.net> | 2012-04-25 11:08:37 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-04-25 11:08:37 -0700 |
commit | 8ec7c84027272952ab6d21c340f4aada1a3e5988 (patch) | |
tree | 33b6235a73b8ae8e391c0325cfa199fb490cdf2f /arch/arm/boot | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
parent | 2b7b9a7d6c676691cd746a654e2c3b06a6feb9ba (diff) |
Merge branch 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into fixes
* 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
ARM: msm: Fix gic irqdomain support
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/msm8660-surf.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts index 15ded0deaa7..45bc4bb04e5 100644 --- a/arch/arm/boot/dts/msm8660-surf.dts +++ b/arch/arm/boot/dts/msm8660-surf.dts @@ -10,7 +10,7 @@ intc: interrupt-controller@02080000 { compatible = "qcom,msm-8660-qgic"; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <3>; reg = < 0x02080000 0x1000 >, < 0x02081000 0x1000 >; }; @@ -19,6 +19,6 @@ compatible = "qcom,msm-hsuart", "qcom,msm-uart"; reg = <0x19c40000 0x1000>, <0x19c00000 0x1000>; - interrupts = <195>; + interrupts = <0 195 0x0>; }; }; |