diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-12 06:30:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-12 06:30:39 -0700 |
| commit | 57120fac12321f636c83af447a081d680c0de2e2 (patch) | |
| tree | 4b502f4f2b7e15bc012ff8b95884c32372b6687d /include | |
| parent | 8714f8f5fe396ca513ccaaac2304497439c181fb (diff) | |
| parent | 5a5e78cd706ce0577ed6356634a34552c866cc10 (diff) | |
| download | linux-57120fac12321f636c83af447a081d680c0de2e2.tar.gz linux-57120fac12321f636c83af447a081d680c0de2e2.tar.bz2 linux-57120fac12321f636c83af447a081d680c0de2e2.zip | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
- fix an ordering issue in cpu cooling that cooling device is
registered before it's ready (freq_table being populated).
(Lukasz Luba)
- fix a missing comment update (Caesar Wang)
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: add the note for set_trip_temp
thermal: cpu_cooling: fix improper order during initialization
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/thermal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e45abe7db9a6..ee517bef0db0 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -335,6 +335,8 @@ struct thermal_genl_event { * @get_trend: a pointer to a function that reads the sensor temperature trend. * @set_emul_temp: a pointer to a function that sets sensor emulated * temperature. + * @set_trip_temp: a pointer to a function that sets the trip temperature on + * hardware. */ struct thermal_zone_of_device_ops { int (*get_temp)(void *, int *); |