| Message ID | 1371501578-24484-1-git-send-email-davidb@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jun 17, 2013 at 01:39:38PM -0700, David Brown wrote: > 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
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts index e9eb835..db2060c 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>;
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> --- arch/arm/boot/dts/msm8960-cdp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)