summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-09 21:29:42 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-09 21:29:42 +0400
commit77bd2adb97271c5f2237cfacf5984cc810033131 (patch)
tree77b30ef19a5d0581c02e3d23c553492c1c277c25 /include/linux
parent754ac45745711a7ce0067087e5b55a9c277952ad (diff)
parentd4faadd5d5b368a7051fef374ee933ec3606713b (diff)
downloadlinux-77bd2adb97271c5f2237cfacf5984cc810033131.tar.xz
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/linux')
-rw-r--r--include/linux/cpufreq.h8
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 *
*********************************************************************/