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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Olof Johansson 13 years ago dfac74d3 e3264354

+2 -2

1 changed file

expand all

arch

arm

boot

dts

tegra30.dtsi

+2 -2

arch/arm/boot/dts/tegra30.dtsi

··· 73 73 74 74 pinmux: pinmux { 75 75 compatible = "nvidia,tegra30-pinmux"; 76 - reg = <0x70000868 0xd0 /* Pad control registers */ 77 - 0x70003000 0x3e0>; /* Mux registers */ 76 + reg = <0x70000868 0xd4 /* Pad control registers */ 77 + 0x70003000 0x3e4>; /* Mux registers */ 78 78 }; 79 79 80 80 serial@70006000 {