Re: [PATCH] ARM: dts: fix bad merge of display timing node to exynos5250-smdk5250.dts

From: Kukjin Kim
Date: Mon Apr 08 2013 - 14:23:45 EST


On 04/09/13 01:51, Doug Anderson wrote:
The display timing node was added:
7ed2077 ARM: dts: Add display timing node to exynos5250-smdk5250.dts
...and looks OK there. ...but it looks like we lost a "};" in the
merge and it no longer compiles. Fix it.

Signed-off-by: Doug Anderson<dianders@xxxxxxxxxxxx>
---
arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 4be14df..26d856b 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -239,6 +239,7 @@
vback-porch =<4>;
vfront-porch =<4>;
vsync-len =<4>;
+ };
};

fixed-rate-clocks {

Thanks for your pointing out. But it should be fixed with re-sorting out the branch.

If any problems, please let me know.

- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/