diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 18:29:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 18:29:42 +0100 |
| commit | 77bd2adb97271c5f2237cfacf5984cc810033131 (patch) | |
| tree | 77b30ef19a5d0581c02e3d23c553492c1c277c25 /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | Revert "cpufreq: fix garbage kobjects on errors during suspend/resume" (diff) | |
| download | linux-77bd2adb97271c5f2237cfacf5984cc810033131.tar.xz linux-77bd2adb97271c5f2237cfacf5984cc810033131.zip | |
Merge tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixup from Rafael Wysocki:
"This reverts two cpufreq commits that fixed issues for some people,
but broke things for others, so revert them and we'll need to fix the
original problems differently"
* tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"
Revert "cpufreq: suspend governors on system suspend/hibernate"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index ee5fe9d77ae8..dc196bbcf227 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -280,14 +280,6 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy) policy->cpuinfo.max_freq); } -#ifdef CONFIG_CPU_FREQ -void cpufreq_suspend(void); -void cpufreq_resume(void); -#else -static inline void cpufreq_suspend(void) {} -static inline void cpufreq_resume(void) {} -#endif - /********************************************************************* * CPUFREQ NOTIFIER INTERFACE * *********************************************************************/ |