diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 13:35:48 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 13:35:48 +1100 |
commit | 4d55a2ca6f6f4091cda0cbcfbf1ff3f3c2b956f5 (patch) | |
tree | cb96fed21f012d05977c08a04932056dcc84b577 /drivers | |
parent | 56e81c17d29169002dfd1b2a6839556734135546 (diff) | |
parent | 62bfdfa1de1361b2fb8201c72def1bbca5e7a395 (diff) |
Merge remote branch 'cpufreq/next'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 526bfbf69611..b0d8f3df02e3 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -118,7 +118,7 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu, if (wall) *wall = (cputime64_t)jiffies_to_usecs(cur_wall_time); - return (cputime64_t)jiffies_to_usecs(idle_time);; + return (cputime64_t)jiffies_to_usecs(idle_time); } static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) |