From: Kukjin Kim <kgene.kim@samsung.com>
To: Doug Anderson <dianders@chromium.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>,
linux-samsung-soc@vger.kernel.org,
Russell King <linux@arm.linux.org.uk>,
Leela Krishna Amudala <l.krishna@samsung.com>,
Jingoo Han <jg1.han@samsung.com>,
linux-kernel@vger.kernel.org,
Thomas Abraham <thomas.abraham@linaro.org>,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org,
Rahul Sharma <rahul.sharma@samsung.com>
Subject: Re: [PATCH] ARM: dts: fix bad merge of display timing node to exynos5250-smdk5250.dts
Date: Tue, 09 Apr 2013 03:23:34 +0900 [thread overview]
Message-ID: <51630B26.1000102@samsung.com> (raw)
In-Reply-To: <1365439879-3398-1-git-send-email-dianders@chromium.org>
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@chromium.org>
> ---
> 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
next prev parent reply other threads:[~2013-04-08 18:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 16:51 [PATCH] ARM: dts: fix bad merge of display timing node to exynos5250-smdk5250.dts Doug Anderson
2013-04-08 18:23 ` Kukjin Kim [this message]
2013-04-08 18:25 ` Doug Anderson
2013-04-08 18:29 ` Kukjin Kim
2013-04-08 19:21 ` Doug Anderson
2013-04-08 19:27 ` Tomasz Figa
2013-04-08 19:41 ` Doug Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51630B26.1000102@samsung.com \
--to=kgene.kim@samsung.com \
--cc=dianders@chromium.org \
--cc=jg1.han@samsung.com \
--cc=l.krishna@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=rahul.sharma@samsung.com \
--cc=thomas.abraham@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox