* Merge error in for-next branch in kgene/linux-samsung.git
@ 2012-03-09 9:49 Tushar Behera
2012-03-09 18:08 ` Kukjin Kim
0 siblings, 1 reply; 2+ messages in thread
From: Tushar Behera @ 2012-03-09 9:49 UTC (permalink / raw)
To: linux-samsung-soc@vger.kernel.org; +Cc: Kukjin Kim
Hi Kukjin,
Need to fix following merge error in your for-next branch.
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),
--
Tushar Behera
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: Merge error in for-next branch in kgene/linux-samsung.git
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
0 siblings, 0 replies; 2+ messages in thread
From: Kukjin Kim @ 2012-03-09 18:08 UTC (permalink / raw)
To: Tushar Behera; +Cc: linux-samsung-soc@vger.kernel.org, Kukjin Kim
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),
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-09 18:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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.