Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/topic...

[linux.git] / include / linux / thermal.h

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 1b8a5a7876ce67abbc0d6cac4004f816c31bf221..ee517bef0db04902412c17b7eceac24839a4564f 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -335,11 +335,14 @@ struct thermal_genl_event {
  * @get_trend: a pointer to a function that reads the sensor temperature trend.
  * @set_emul_temp: a pointer to a function that sets sensor emulated
  *                temperature.
+ * @set_trip_temp: a pointer to a function that sets the trip temperature on
+ *                hardware.
  */
 struct thermal_zone_of_device_ops {
        int (*get_temp)(void *, int *);
        int (*get_trend)(void *, long *);
        int (*set_emul_temp)(void *, int);
+       int (*set_trip_temp)(void *, int, int);
 };
 
 /**