diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-26 04:04:47 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-26 04:04:47 +0900 |
commit | b5783dcaed065ae6622a9795a19a4eda748b64f8 (patch) | |
tree | 7a1dc27919e217182fc1a7d3105e10f426b993ec /drivers/cpufreq | |
parent | 702b691e4a711e699cf3cccba879c1d945665c0d (diff) | |
parent | 34c453ce16633539a94a2e876faeb731ac1be899 (diff) | |
download | op-kernel-dev-b5783dcaed065ae6622a9795a19a4eda748b64f8.zip op-kernel-dev-b5783dcaed065ae6622a9795a19a4eda748b64f8.tar.gz |
Merge branch 'v3.16-next/clk-s3c24xx-3' into v3.16-next/cleanup-samsung
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/s3c24xx-cpufreq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c index be1b2b5..227ebf7 100644 --- a/drivers/cpufreq/s3c24xx-cpufreq.c +++ b/drivers/cpufreq/s3c24xx-cpufreq.c @@ -141,6 +141,7 @@ static int s3c_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg) static void s3c_cpufreq_setfvco(struct s3c_cpufreq_config *cfg) { + cfg->mpll = _clk_mpll; (cfg->info->set_fvco)(cfg); } |