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

Commit dfac74d3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-3.7/fixes-for-rc4' of... 

Merge branch 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes

From Stephen Warren:
* 'for-3.7/fixes-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: dt: tegra: fix length of pad control and mux registers
parents e3264354 322337b8

arch/arm/boot/dts/tegra30.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 


	pinmux: pinmux {

		compatible = "nvidia,tegra30-pinmux";

		reg = <0x70000868 0xd0    /* Pad control registers */

		       0x70003000 0x3e0>; /* Mux registers */

		reg = <0x70000868 0xd4    /* Pad control registers */

		       0x70003000 0x3e4>; /* Mux registers */

	};



	serial@70006000 {