* [PATCH] ARM: dts: msm: Fix merge resolution
@ 2013-06-17 20:39 David Brown
2013-06-18 7:29 ` Olof Johansson
0 siblings, 1 reply; 2+ messages in thread
From: David Brown @ 2013-06-17 20:39 UTC (permalink / raw)
To: Olof Johansson
Cc: David Brown, Russell King, linux-arm-kernel, linux-kernel,
linux-arm-msm, Stephen Boyd
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(-)
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>;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: dts: msm: Fix merge resolution
2013-06-17 20:39 [PATCH] ARM: dts: msm: Fix merge resolution David Brown
@ 2013-06-18 7:29 ` Olof Johansson
0 siblings, 0 replies; 2+ messages in thread
From: Olof Johansson @ 2013-06-18 7:29 UTC (permalink / raw)
To: David Brown
Cc: Russell King, linux-arm-kernel, linux-kernel, linux-arm-msm,
Stephen Boyd
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-18 7:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-17 20:39 [PATCH] ARM: dts: msm: Fix merge resolution David Brown
2013-06-18 7:29 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox