diff options
| author | Takashi Iwai | 2012-11-22 21:22:39 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2012-11-22 21:22:39 +0100 |
| commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
| tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /arch/arm/boot/dts/tegra30.dtsi | |
| parent | ALSA: emu10k1: Add missing ifdef for emu->suspend reference (diff) | |
| parent | ALSA: snd-usb: properly initialize the sync endpoint (diff) | |
| download | kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.gz kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.xz kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/arm/boot/dts/tegra30.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index b1497c7d7d68..df7f2270fc91 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -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 { |