diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-08 15:49:25 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-08 15:49:25 -0400 |
| commit | 85a229f4c729c4de48ba241f77e447c36bbc07f7 (patch) | |
| tree | 924a27434d5846f69b541012494d6ea1f2cb10cf /include/linux | |
| parent | f991fae5c6d42dfc5029150b05a78cf3f6c18cc9 (diff) | |
| parent | 266c13d767be61a17d8e6f2310b9b7c46278273b (diff) | |
Merge branch 'pm-fixes'
* pm-fixes:
cpufreq: Fix serialization of frequency transitions
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpufreq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 4d7390bc1727..90d5a15120d5 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h | |||
| @@ -119,7 +119,7 @@ struct cpufreq_policy { | |||
| 119 | 119 | ||
| 120 | struct kobject kobj; | 120 | struct kobject kobj; |
| 121 | struct completion kobj_unregister; | 121 | struct completion kobj_unregister; |
| 122 | bool transition_ongoing; /* Tracks transition status */ | 122 | int transition_ongoing; /* Tracks transition status */ |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| 125 | #define CPUFREQ_ADJUST (0) | 125 | #define CPUFREQ_ADJUST (0) |