Commit a6f90614 authored Jun 25, 2013 by Olof Johansson

linux...

Merge tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/fixes-non-critical

From Jason Cooper:
 - mv78260: catch missing fix for mvneta register length

* tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux

:
  ARM: mvebu: fix length of ethernet registers in mv78260 dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>

parents ab182463 cdd8e498

arch/arm/boot/dts/armada-xp-mv78260.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@

		ethernet@34000 {
		compatible = "marvell,armada-370-neta";
		reg = <0x34000 0x2500>;
		reg = <0x34000 0x4000>;
		interrupts = <14>;
		clocks = <&gateclk 1>;
		status = "disabled";

Admin message