diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-10 11:24:10 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-10 11:24:10 +1100 |
| commit | e80ba46120f92102ba92c04158fcbf20cb175515 (patch) | |
| tree | 9a7c6b6f6fb637a63d09af50d21357b1743f9690 | |
| parent | 721cb59e9d95eb7f47ec73711ed35ef85e1ea1ca (diff) | |
| parent | c65ec135960e4555f65d8c9243f65b2fb88ac071 (diff) | |
| download | blackbird-op-linux-e80ba46120f92102ba92c04158fcbf20cb175515.tar.gz blackbird-op-linux-e80ba46120f92102ba92c04158fcbf20cb175515.zip | |
Merge remote-tracking branch 'agust/merge' into merge
Anatolij Gustschin says:
<<
Please pull a device tree fix for v3.13. The booting on mpc512x
is broken since v3.13-rc1, this patch repairs it.
>>
| -rw-r--r-- | arch/powerpc/boot/dts/mpc5121.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi index bd14c00e5146..2d7cb04ac962 100644 --- a/arch/powerpc/boot/dts/mpc5121.dtsi +++ b/arch/powerpc/boot/dts/mpc5121.dtsi @@ -77,7 +77,6 @@ compatible = "fsl,mpc5121-immr"; #address-cells = <1>; #size-cells = <1>; - #interrupt-cells = <2>; ranges = <0x0 0x80000000 0x400000>; reg = <0x80000000 0x400000>; bus-frequency = <66000000>; /* 66 MHz ips bus */ |
