ARM: dts: msm: Fix merge resolution
authorDavid Brown <davidb@codeaurora.org>
Mon, 17 Jun 2013 20:39:38 +0000 (13:39 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 18 Jun 2013 07:29:05 +0000 (00:29 -0700)
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>
arch/arm/boot/dts/msm8960-cdp.dts

index e9eb83541c975850af157b532fab6e3d61d2518d..db2060c465404d81faab3cd8d2c8427588c1354f 100644 (file)
@@ -37,7 +37,7 @@
                reg = <0xfd510000 0x4000>;
        };
 
-       serial@19440000 {
+       serial@16440000 {
                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
                reg = <0x16440000 0x1000>,
                      <0x16400000 0x1000>;