diff --git a/[refs] b/[refs] index 5dd210e51141..25793005fe98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 169e8d03f02d98e7d02afca275dfbc1c834ed360 +refs/heads/master: 8c99c166bd5ba8c66488e3035572804a7d2ff533 diff --git a/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h b/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h index ef6981c9436a..7b2d600f1352 100644 --- a/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h +++ b/trunk/drivers/staging/ti-soc-thermal/ti-thermal.h @@ -76,6 +76,7 @@ #ifdef CONFIG_TI_THERMAL int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain); int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id); +int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id); int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id); int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id); #else @@ -91,6 +92,12 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) return 0; } +static inline +int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id) +{ + return 0; +} + static inline int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) {