| Message ID | 1331100559-28849-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On 03/06/12 22:09, Sachin Kamat wrote: > Commit 734b5bb7375 ("Merge branch 'next/soc-exynos5250-arch-wip' into for-next") > on for-next branch of Kukjin's tree gives the following build errors: > > arch/arm/mach-exynos/clock-exynos4.c:1328:2: error: ‘clk_sclk_mmc0’ > undeclared here (not in a function) > arch/arm/mach-exynos/clock-exynos4.c:1329:2: error: ‘clk_sclk_mmc1’ > undeclared here (not in a function) > arch/arm/mach-exynos/clock-exynos4.c:1330:2: error: ‘clk_sclk_mmc2’ > undeclared here (not in a function) > arch/arm/mach-exynos/clock-exynos4.c:1331:2: error: ‘clk_sclk_mmc3’ > undeclared here (not in a function) > > This commit fixes the same. > > Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org> > --- > arch/arm/mach-exynos/clock-exynos4.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c > index d72a1fe..bcb59e7 100644 > --- a/arch/arm/mach-exynos/clock-exynos4.c > +++ b/arch/arm/mach-exynos/clock-exynos4.c > @@ -1325,10 +1325,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",&clk_sclk_mmc0.clk), > - CLKDEV_INIT("exynos4-sdhci.1", "mmc_busclk.2",&clk_sclk_mmc1.clk), > - CLKDEV_INIT("exynos4-sdhci.2", "mmc_busclk.2",&clk_sclk_mmc2.clk), > - CLKDEV_INIT("exynos4-sdhci.3", "mmc_busclk.2",&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("s3c64xx-spi.0", "spi_busclk0",&exynos4_clk_sclk_spi0.clk), Yes, should be fixed. will apply. Thanks. 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 d72a1fe..bcb59e7 100644 --- a/arch/arm/mach-exynos/clock-exynos4.c +++ b/arch/arm/mach-exynos/clock-exynos4.c @@ -1325,10 +1325,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", &clk_sclk_mmc0.clk), - CLKDEV_INIT("exynos4-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk), - CLKDEV_INIT("exynos4-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk), - CLKDEV_INIT("exynos4-sdhci.3", "mmc_busclk.2", &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("s3c64xx-spi.0", "spi_busclk0", &exynos4_clk_sclk_spi0.clk),
Commit 734b5bb7375 ("Merge branch 'next/soc-exynos5250-arch-wip' into for-next") on for-next branch of Kukjin's tree gives the following build errors: arch/arm/mach-exynos/clock-exynos4.c:1328:2: error: ‘clk_sclk_mmc0’ undeclared here (not in a function) arch/arm/mach-exynos/clock-exynos4.c:1329:2: error: ‘clk_sclk_mmc1’ undeclared here (not in a function) arch/arm/mach-exynos/clock-exynos4.c:1330:2: error: ‘clk_sclk_mmc2’ undeclared here (not in a function) arch/arm/mach-exynos/clock-exynos4.c:1331:2: error: ‘clk_sclk_mmc3’ undeclared here (not in a function) This commit fixes the same. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- arch/arm/mach-exynos/clock-exynos4.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)