diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 11:28:02 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 11:28:02 (GMT) |
commit | fe10739284bae68b57d3dbcad81f34772cfd2716 (patch) | |
tree | 896fa694b7f6a46266ff8eb5291c35781be53e25 /drivers/cpufreq/ppc_cbe_cpufreq.c | |
parent | 8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6 (diff) | |
parent | f334a1e8434c49b6f9c947d3eb7caf712fbcc3fa (diff) | |
download | linux-fe10739284bae68b57d3dbcad81f34772cfd2716.tar.xz |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: ppc: Remove duplicate inclusion of fsl_soc.h
cpufreq: create another field .flags in cpufreq_frequency_table
cpufreq: use kzalloc() to allocate memory for cpufreq_frequency_table
cpufreq: don't print value of .driver_data from core
cpufreq: ia64: don't set .driver_data to index
cpufreq: powernv: Select CPUFreq related Kconfig options for powernv
cpufreq: powernv: Use cpufreq_frequency_table.driver_data to store pstate ids
cpufreq: powernv: cpufreq driver for powernv platform
cpufreq: at32ap: don't declare local variable as static
cpufreq: loongson2_cpufreq: don't declare local variable as static
cpufreq: unicore32: fix typo issue for 'clk'
cpufreq: exynos: Disable on multiplatform build
Diffstat (limited to 'drivers/cpufreq/ppc_cbe_cpufreq.c')
-rw-r--r-- | drivers/cpufreq/ppc_cbe_cpufreq.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c index af7b1ca..5be8a48 100644 --- a/drivers/cpufreq/ppc_cbe_cpufreq.c +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c @@ -32,15 +32,15 @@ /* the CBE supports an 8 step frequency scaling */ static struct cpufreq_frequency_table cbe_freqs[] = { - {1, 0}, - {2, 0}, - {3, 0}, - {4, 0}, - {5, 0}, - {6, 0}, - {8, 0}, - {10, 0}, - {0, CPUFREQ_TABLE_END}, + {0, 1, 0}, + {0, 2, 0}, + {0, 3, 0}, + {0, 4, 0}, + {0, 5, 0}, + {0, 6, 0}, + {0, 8, 0}, + {0, 10, 0}, + {0, 0, CPUFREQ_TABLE_END}, }; /* |