diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-09 12:27:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-09 12:27:27 +0000 |
| commit | c810fcb930d9c705774427bb6eb551b2e1108adb (patch) | |
| tree | 46d7da6bbb1e0e6d9b184cc69ade2a7da6e20ae7 /drivers/base | |
| parent | b94eedf4bb47fe789e3947875beb24f558ebd119 (diff) | |
| parent | db295c89378fa7c9cfffd1ed08b9c77d2d1dd9ea (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 220ec3a3ca75..5a9b6569dd74 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -28,8 +28,6 @@ #include <linux/sched.h> #include <linux/async.h> #include <linux/suspend.h> -#include <trace/events/power.h> -#include <linux/cpufreq.h> #include <linux/cpuidle.h> #include "../base.h" #include "power.h" @@ -715,8 +713,6 @@ void dpm_resume(pm_message_t state) mutex_unlock(&dpm_list_mtx); async_synchronize_full(); dpm_show_time(starttime, state, NULL); - - cpufreq_resume(); } /** @@ -1181,8 +1177,6 @@ int dpm_suspend(pm_message_t state) might_sleep(); - cpufreq_suspend(); - mutex_lock(&dpm_list_mtx); pm_transition = state; async_error = 0; |