Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / cpufreq / ppc_cbe_cpufreq.c

diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index e577a1dbbfcd572be200a7a73f81728959bb24b5..5936f8d6f2cc3e855ce52a814705ee9d1e35b10b 100644 (file)
--- a/drivers/cpufreq/ppc_cbe_cpufreq.c
+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c
@@ -106,7 +106,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
        /* initialize frequency table */
        for (i=0; cbe_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
-               cbe_freqs[i].frequency = max_freq / cbe_freqs[i].index;
+               cbe_freqs[i].frequency = max_freq / cbe_freqs[i].driver_data;
                pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
        }
 
@@ -165,7 +165,7 @@ static int cbe_cpufreq_target(struct cpufreq_policy *policy,
                 "1/%d of max frequency\n",
                 policy->cpu,
                 cbe_freqs[cbe_pmode_new].frequency,
-                cbe_freqs[cbe_pmode_new].index);
+                cbe_freqs[cbe_pmode_new].driver_data);
 
        rc = set_pmode(policy->cpu, cbe_pmode_new);