diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2015-01-14 15:49:19 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-01-14 15:49:19 +0800 |
| commit | a4378cc66d9c772dc37d32d434b14c7545e6fc21 (patch) | |
| tree | 71c3f71c7f11376476ccea7848019f9d890de418 /drivers/thermal/thermal_core.h | |
| parent | 693a30b8f19a964087a3762d09fb2e1cbad6b0d4 (diff) | |
| parent | ee853addd9fedb116bd34a18f11dd5959fcf0428 (diff) | |
| download | op-kernel-dev-a4378cc66d9c772dc37d32d434b14c7545e6fc21.zip op-kernel-dev-a4378cc66d9c772dc37d32d434b14c7545e6fc21.tar.gz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/thermal_core.h')
| -rw-r--r-- | drivers/thermal/thermal_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index 9083e75..0531c75 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -91,7 +91,7 @@ int of_parse_thermal_zones(void); void of_thermal_destroy_zones(void); int of_thermal_get_ntrips(struct thermal_zone_device *); bool of_thermal_is_trip_valid(struct thermal_zone_device *, int); -const struct thermal_trip * const +const struct thermal_trip * of_thermal_get_trip_points(struct thermal_zone_device *); #else static inline int of_parse_thermal_zones(void) { return 0; } @@ -105,7 +105,7 @@ static inline bool of_thermal_is_trip_valid(struct thermal_zone_device *tz, { return 0; } -static inline const struct thermal_trip * const +static inline const struct thermal_trip * of_thermal_get_trip_points(struct thermal_zone_device *tz) { return NULL; |
