ARM: dts: msm: Fix merge resolution
Subsystems (2)
PATCH 1/1 ARM: dts: msm: Fix merge resolution
Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' ofgit://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup) incorrectly resolved a merge conflict, resulting in a node address that doesn't match the register address.
Fix this node address.
Signed-off-by David Brown <[email protected]>
Cc Stephen Boyd <[email protected]>
--- arch/arm/boot/dts/msm8960-cdp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/msm8960-cdp.dts +1 -1
@@ -37,7 +37,7 @@ reg = <0xfd510000 0x4000>; }; - serial at 19440000 { + serial at 16440000 { compatible = "qcom,msm-hsuart", "qcom,msm-uart"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 6 lines · David Brown
Commit
e45600107b(Merge tag 'msm-cleanup-for-3.11' ofgit://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msminto next/cleanup) incorrectly resolved a merge conflict, resulting in a node address that doesn't match the register address.Fix this node address.
Luckily this is just cosmetic. Applied.
-Olof