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>
This commit is contained in:
David Brown 2013-06-17 13:39:38 -07:00 коммит произвёл Olof Johansson
Родитель 75d39696d3
Коммит f333c13c9e
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -37,7 +37,7 @@
reg = <0xfd510000 0x4000>;
};
serial@19440000 {
serial@16440000 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x16440000 0x1000>,
<0x16400000 0x1000>;