Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f333c13c authored by David Brown's avatar David Brown Committed by Olof Johansson
Browse files

ARM: dts: msm: Fix merge resolution 

Commit e4560010 (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: default avatarDavid Brown <davidb@codeaurora.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 75d39696

arch/arm/boot/dts/msm8960-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
		reg = <0xfd510000 0x4000>;

	};



	serial@19440000 {

	serial@16440000 {

		compatible = "qcom,msm-hsuart", "qcom,msm-uart";

		reg = <0x16440000 0x1000>,

		      <0x16400000 0x1000>;