diff options
| author | David Brown <davidb@codeaurora.org> | 2013-06-17 20:39:38 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-18 07:29:05 (GMT) |
| commit | f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b (patch) | |
| tree | f8a9950a805f3652cd7cd23bb727db2accf39ef9 /arch | |
| parent | 75d39696d31fa8ef4a099a37d1b6b4e91c9a8775 (diff) | |
| download | linux-fsl-qoriq-f333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b.tar.xz | |
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 <davidb@codeaurora.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/msm8960-cdp.dts | 2 |
1 files changed, 1 insertions, 1 deletions
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>; |