Merge remote-tracking branch 'regulator/fix/qcom-spmi' into regulator-linus

[sfrench/cifs-2.6.git] / include / linux / thermal.h

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index e275e98bdceb46fe1e8550a0d0c3ff4d18de80f3..fd5b959c753c5340f3eaa58da5b752fea2908e84 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -102,6 +102,7 @@ enum thermal_notify_event {
        THERMAL_DEVICE_DOWN, /* Thermal device is down */
        THERMAL_DEVICE_UP, /* Thermal device is up after a down event */
        THERMAL_DEVICE_POWER_CAPABILITY_CHANGED, /* power capability changed */
+       THERMAL_TABLE_CHANGED, /* Thermal table(s) changed */
 };
 
 struct thermal_zone_device_ops {
@@ -194,7 +195,7 @@ struct thermal_attr {
  * @governor:  pointer to the governor for this thermal zone
  * @governor_data:     private pointer for governor data
  * @thermal_instances: list of &struct thermal_instance of this thermal zone
- * @idr:       &struct idr to generate unique id for this zone's cooling
+ * @ida:       &struct ida to generate unique id for this zone's cooling
  *             devices
  * @lock:      lock to protect thermal_instances list
  * @node:      node in thermal_tz_list (in thermal_core.c)
@@ -227,7 +228,7 @@ struct thermal_zone_device {
        struct thermal_governor *governor;
        void *governor_data;
        struct list_head thermal_instances;
-       struct idr idr;
+       struct ida ida;
        struct mutex lock;
        struct list_head node;
        struct delayed_work poll_queue;