Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / thermal.h

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 4821735f3e778c0b8c09264135cecbe3106590dc..4b94a61955df361934984992b37e185b8d933f87 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -60,6 +60,10 @@ struct thermal_zone_device_ops {
                              unsigned long *);
        int (*set_trip_temp) (struct thermal_zone_device *, int,
                              unsigned long);
+       int (*get_trip_hyst) (struct thermal_zone_device *, int,
+                             unsigned long *);
+       int (*set_trip_hyst) (struct thermal_zone_device *, int,
+                             unsigned long);
        int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
        int (*notify) (struct thermal_zone_device *, int,
                       enum thermal_trip_type);
@@ -98,6 +102,7 @@ struct thermal_zone_device {
        struct device device;
        struct thermal_attr *trip_temp_attrs;
        struct thermal_attr *trip_type_attrs;
+       struct thermal_attr *trip_hyst_attrs;
        void *devdata;
        int trips;
        int tc1;