diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-23 20:30:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-23 20:30:52 -0800 |
| commit | f6be19c8bcca7185dcbda61f34f99d8b15bcd165 (patch) | |
| tree | 28221937b24d1cbb372bb528f9f7368488c14470 /arch | |
| parent | 51edce0ccee090ea762a3014510e7870d25c49df (diff) | |
| parent | 09d75bc7d217bd8868899028a98b53423e6b3324 (diff) | |
Merge tag 'mvebu_fixes_for_v3.8-rc5' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper:
mvebu fixes for v3.8-rc5
- fix memory leak in mvebu/clk-cpu.c
- use devm_ to correct/simplify error paths in mvsdio
- add missing #interrupt-cells property in kirkwood
* tag 'mvebu_fixes_for_v3.8-rc5' of git://git.infradead.org/users/jcooper/linux:
ARM: kirkwood: fix missing #interrupt-cells property
mmc: mvsdio: use devm_ API to simplify/correct error paths.
clk: mvebu/clk-cpu.c: fix memory leakage
Diffstat (limited to 'arch')
| -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 110d6cbb795..d6ab442b701 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>; }; |