Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e80ba461 authored Dec 10, 2013 by Benjamin Herrenschmidt

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.
>>

parents 721cb59e c65ec135

arch/powerpc/boot/dts/mpc5121.dtsi

+0 −1

Original line number	Diff line number	Diff line
		@@ -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 */