From: Kukjin Kim <kgene.kim@samsung.com>
To: Tushar Behera <tushar.behera@linaro.org>
Cc: "linux-samsung-soc@vger.kernel.org"
<linux-samsung-soc@vger.kernel.org>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: Re: Merge error in for-next branch in kgene/linux-samsung.git
Date: Fri, 09 Mar 2012 10:08:22 -0800 [thread overview]
Message-ID: <4F5A4716.8080300@samsung.com> (raw)
In-Reply-To: <4F59D21A.4000605@linaro.org>
2012-03-09 01:49, Tushar Behera wrote:
> Hi Kukjin,
>
> Need to fix following merge error in your for-next branch.
>
Oops :(
Tushar, thank you and let me fix it.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
>
> diff --git a/arch/arm/mach-exynos/clock-exynos4.c
> b/arch/arm/mach-exynos/clock-exynos4.c
> index af48ad1..4f7ed78 100644
> --- a/arch/arm/mach-exynos/clock-exynos4.c
> +++ b/arch/arm/mach-exynos/clock-exynos4.c
> @@ -1333,10 +1333,10 @@ static struct clk_lookup exynos4_clk_lookup[] = {
> CLKDEV_INIT("exynos4210-uart.1", "clk_uart_baud0",
> &exynos4_clk_sclk_uart1.clk),
> CLKDEV_INIT("exynos4210-uart.2", "clk_uart_baud0",
> &exynos4_clk_sclk_uart2.clk),
> CLKDEV_INIT("exynos4210-uart.3", "clk_uart_baud0",
> &exynos4_clk_sclk_uart3.clk),
> -+ CLKDEV_INIT("exynos4-sdhci.0", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc0.clk),
> -+ CLKDEV_INIT("exynos4-sdhci.1", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc1.clk),
> -+ CLKDEV_INIT("exynos4-sdhci.2", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc2.clk),
> -+ CLKDEV_INIT("exynos4-sdhci.3", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc3.clk),
> + CLKDEV_INIT("exynos4-sdhci.0", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc0.clk),
> + CLKDEV_INIT("exynos4-sdhci.1", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc1.clk),
> + CLKDEV_INIT("exynos4-sdhci.2", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc2.clk),
> + CLKDEV_INIT("exynos4-sdhci.3", "mmc_busclk.2",
> &exynos4_clk_sclk_mmc3.clk),
> CLKDEV_INIT("dma-pl330.0", "apb_pclk",&exynos4_clk_pdma0),
> CLKDEV_INIT("dma-pl330.1", "apb_pclk",&exynos4_clk_pdma1),
> CLKDEV_INIT("dma-pl330.2", "apb_pclk",&exynos4_clk_mdma1),
>
prev parent reply other threads:[~2012-03-09 18:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 9:49 Merge error in for-next branch in kgene/linux-samsung.git Tushar Behera
2012-03-09 18:08 ` Kukjin Kim [this message]
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=4F5A4716.8080300@samsung.com \
--to=kgene.kim@samsung.com \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=tushar.behera@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.