diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-02 16:08:56 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-02 16:08:56 (GMT) |
| commit | 726dcbe5f5d88080b9106f3a55b95d358b2aa140 (patch) | |
| tree | 7699d33c6e8ade748e3c4154933be8d2b475b25d /drivers/cpufreq/spear-cpufreq.c | |
| parent | 8a21c0e745cf726d5cb5ed0cfdee5857d2dd0ce7 (diff) | |
| parent | 19ea1a4400e9b8a3858c358509e2514d4eef785f (diff) | |
| download | linux-fsl-qoriq-726dcbe5f5d88080b9106f3a55b95d358b2aa140.tar.xz | |
Merge branch 'pm-fixes'
* pm-fixes:
intel_pstate: fix no_turbo
cpufreq: cpufreq-cpu0: NULL is a valid regulator, part 2
cpufreq: SPEAr: Fix incorrect variable type
PM / hibernate: Fix user space driven resume regression
Diffstat (limited to 'drivers/cpufreq/spear-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/spear-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c index 19e364fa..3f41816 100644 --- a/drivers/cpufreq/spear-cpufreq.c +++ b/drivers/cpufreq/spear-cpufreq.c @@ -113,7 +113,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation) { struct cpufreq_freqs freqs; - unsigned long newfreq; + long newfreq; struct clk *srcclk; int index, ret, mult = 1; |