diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-01-16 09:17:42 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-01-16 09:17:42 +0800 |
commit | 7bbbbe2e4bd1aa7c7b88a79e7fa1930c56fa8cf8 (patch) | |
tree | ba6418d4c70efa59a8ff759f134271b2848dd56c /drivers/cpufreq | |
parent | 97a3f598db7ca886011296d9e364e20ab4d6e372 (diff) | |
parent | c8e95ac690b37fd1a469c685d716e24abae26992 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 7054c579d45..a22fb3e4725 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -516,7 +516,8 @@ static void intel_pstate_timer_func(unsigned long __data) } #define ICPU(model, policy) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&policy } + { X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\ + (unsigned long)&policy } static const struct x86_cpu_id intel_pstate_cpu_ids[] = { ICPU(0x2a, default_policy), |