diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-25 00:57:37 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-25 00:57:37 +0800 |
| commit | 07273d25b87b266be1b0c41e245025c9107d6699 (patch) | |
| tree | 26907ca68662a299a3aac1eea05847d9ad2e00df /include/linux | |
| parent | eea2d4812dbe14a00f657641a0ac3ba0a36ad33c (diff) | |
| parent | e44dec77be9e032ff9c2f95f17f7df3a55b58f60 (diff) | |
Merge branch 'cpu_cooling-doc-comments-update' of .git into next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpu_cooling.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index 77c87c9d0193..f48f6fbcd3be 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -25,9 +25,7 @@ #define __CPU_COOLING_H__ #include <linux/thermal.h> - -#define CPUFREQ_COOLING_START 0 -#define CPUFREQ_COOLING_STOP 1 +#include <linux/cpumask.h> #ifdef CONFIG_CPU_THERMAL /** |