From c51b3cfbc0bce41c04b123ee3e80d05844a17e7d Mon Sep 17 00:00:00 2001 From: Jonghwan Choi Date: Tue, 23 Aug 2011 16:27:17 +0900 Subject: [PATCH] --- yaml --- r: 264006 b: refs/heads/master c: 6861a197e2ed6dd05c0316ee2006730fbb6e7f9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-dove/common.c | 2 +- trunk/arch/arm/mach-exynos4/clock.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fea452cadfa7..f25707101b87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72cc205611879525db0374d9831f84f787112b25 +refs/heads/master: 6861a197e2ed6dd05c0316ee2006730fbb6e7f9a diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c index a9e0dae86a26..83dce859886d 100644 --- a/trunk/arch/arm/mach-dove/common.c +++ b/trunk/arch/arm/mach-dove/common.c @@ -158,7 +158,7 @@ void __init dove_spi0_init(void) void __init dove_spi1_init(void) { - orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk()); + orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk()); } /***************************************************************************** diff --git a/trunk/arch/arm/mach-exynos4/clock.c b/trunk/arch/arm/mach-exynos4/clock.c index 1561b036a9bf..79d6cd0c8e7b 100644 --- a/trunk/arch/arm/mach-exynos4/clock.c +++ b/trunk/arch/arm/mach-exynos4/clock.c @@ -1160,7 +1160,7 @@ void __init_or_cpufreq exynos4_setup_clocks(void) vpllsrc = clk_get_rate(&clk_vpllsrc.clk); vpll = s5p_get_pll46xx(vpllsrc, __raw_readl(S5P_VPLL_CON0), - __raw_readl(S5P_VPLL_CON1), pll_4650); + __raw_readl(S5P_VPLL_CON1), pll_4650c); clk_fout_apll.ops = &exynos4_fout_apll_ops; clk_fout_mpll.rate = mpll;