diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-24 21:43:00 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-24 21:43:00 +0800 |
| commit | 335553ce40f0e551383482ad6b0b0eba87f4f218 (patch) | |
| tree | 02bcc35aed84699d3bbdb08961fa475100b296a8 /include | |
| parent | 4f89038f177462dbd2fd911297fd004226176db7 (diff) | |
| parent | 837b26bb2e4a83d224e725f07a1d9ca824bf905c (diff) | |
Merge branch 'eduardo-1' of .git into next
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 3bda306f7a50..ec2b886f9d96 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -239,6 +239,8 @@ void thermal_zone_device_update(struct thermal_zone_device *); struct thermal_cooling_device *thermal_cooling_device_register(char *, void *, const struct thermal_cooling_device_ops *); void thermal_cooling_device_unregister(struct thermal_cooling_device *); +struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name); +int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp); int get_tz_trend(struct thermal_zone_device *, int); struct thermal_instance *get_thermal_instance(struct thermal_zone_device *, |