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 /include | |
| parent | b94eedf4bb47fe789e3947875beb24f558ebd119 (diff) | |
| parent | db295c89378fa7c9cfffd1ed08b9c77d2d1dd9ea (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 69cb5cc81013..1a81b7470bc4 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -307,18 +307,6 @@ struct freq_attr { static struct freq_attr _name = \ __ATTR(_name, 0444, show_##_name, NULL) -#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 * - *********************************************************************/ - #define cpufreq_freq_attr_ro_perm(_name, _perm) \ static struct freq_attr _name = \ __ATTR(_name, _perm, show_##_name, NULL) |