diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-04-04 10:55:43 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-04-04 10:55:43 +0800 |
commit | b31c69571f2d6dd7a4966517f11e87f0689bb0a8 (patch) | |
tree | 438f78bb59cae3365c7594b381e17c5de32bbf79 /drivers/thermal/thermal_core.h | |
parent | 920553ba25498d26fbc7de610cdcf2f74d470ba0 (diff) | |
parent | 0e0eabed5b2cc7b0fe07f219a866c708b569f560 (diff) |
Merge branch 'thermal-framework' into linux-linaro-lsk
For card https://cards.linaro.org/browse/CARD-1213. This framework tested
under panda ES board with few DT patches backporting.
Diffstat (limited to 'drivers/thermal/thermal_core.h')
-rw-r--r-- | drivers/thermal/thermal_core.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index 7cf2f6626251..3db339fb636f 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -77,4 +77,13 @@ static inline int thermal_gov_user_space_register(void) { return 0; } static inline void thermal_gov_user_space_unregister(void) {} #endif /* CONFIG_THERMAL_GOV_USER_SPACE */ +/* device tree support */ +#ifdef CONFIG_THERMAL_OF +int of_parse_thermal_zones(void); +void of_thermal_destroy_zones(void); +#else +static inline int of_parse_thermal_zones(void) { return 0; } +static inline void of_thermal_destroy_zones(void) { } +#endif + #endif /* __THERMAL_CORE_H__ */ |