From f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 17 Jun 2013 13:39:38 -0700 Subject: [PATCH] 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 Cc: Stephen Boyd Signed-off-by: Olof Johansson --- arch/arm/boot/dts/msm8960-cdp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts index e9eb83541c97..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@19440000 { + serial@16440000 { compatible = "qcom,msm-hsuart", "qcom,msm-uart"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>;