diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-24 03:27:43 +0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-24 03:27:43 +0400 |
| commit | 4fb85d35bcec842e0f20437aea277157973aa45f (patch) | |
| tree | d3b865af2f4066f68828806b231e4bb5b4de9ec8 /arch/arm/mach-omap2/pm.c | |
| parent | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (diff) | |
| parent | a86c0b9867940bd0ba78f109686079b4051a463d (diff) | |
| download | linux-4fb85d35bcec842e0f20437aea277157973aa45f.tar.xz | |
Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
Conflicts:
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
arch/arm/mach-omap2/clkt_clksel.c
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 939bd6f70b51..f6f05b67f86a 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -188,7 +188,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, goto exit; } - freq = clk->rate; + freq = clk_get_rate(clk); clk_put(clk); rcu_read_lock(); |