From: David Brown <davidb@codeaurora.org>
Date: Mon, 17 Jun 2013 20:39:38 +0000 (-0700)
Subject: ARM: dts: msm: Fix merge resolution
X-Git-Tag: next-20130628~14^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d701eda5ef391ffa071617de1f7f3558c6841250;p=karo-tx-linux.git

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.

Signed-off-by: David Brown <davidb@codeaurora.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
[cherry picked into msm for-next by davidb@codeaurora.org]
---

diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
index 58f3ddbf9a8d..db2060c46540 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -37,7 +37,7 @@
 		reg = <0xfd510000 0x4000>;
 	};
 
-	serial@19c40000 {
+	serial@16440000 {
 		compatible = "qcom,msm-hsuart", "qcom,msm-uart";
 		reg = <0x16440000 0x1000>,
 		      <0x16400000 0x1000>;