Skip to contentSkip to conversation

ARM: dts: msm: Fix merge resolution

PATCH In review David Brown 2 participants 2 messages Jun 17, 2013 – Jun 18, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: msm: Fix merge resolution

Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
git://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.

---
 arch/arm/boot/dts/msm8960-cdp.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/msm8960-cdp.dts +1 -1
index e9eb835..db2060c 100644
@@ -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
#1 lore raw
Quoted 6 lines · David Brown

Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
git://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.

Luckily this is just cosmetic. Applied.

-Olof