diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-25 00:57:22 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-25 00:57:22 +0800 |
| commit | eea2d4812dbe14a00f657641a0ac3ba0a36ad33c (patch) | |
| tree | 7e3cce83ca46daf0a99bff186489d83c0b31553b /include | |
| parent | a502be187385666441d4d6fe66efd4179a74d779 (diff) | |
| parent | a00e55f9c8c06e2bba5db5f2e7dec16b86d560ec (diff) | |
Merge branch 'thermal_core-doc-comments-update' of .git into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/thermal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index ec2b886f9d9..d7272ab20eb 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -246,7 +246,7 @@ int get_tz_trend(struct thermal_zone_device *, int); struct thermal_instance *get_thermal_instance(struct thermal_zone_device *, struct thermal_cooling_device *, int); void thermal_cdev_update(struct thermal_cooling_device *); -void notify_thermal_framework(struct thermal_zone_device *, int); +void thermal_notify_framework(struct thermal_zone_device *, int); #ifdef CONFIG_NET extern int thermal_generate_netlink_event(struct thermal_zone_device *tz, |