aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/thermal/thermal_sys.c2
-rw-r--r--include/linux/thermal.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 5feb3353213f..32aa66d7d6b3 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1173,7 +1173,7 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
1173 * longer needed. The passive cooling formula uses tc1 and tc2 as described in 1173 * longer needed. The passive cooling formula uses tc1 and tc2 as described in
1174 * section 11.1.5.1 of the ACPI specification 3.0. 1174 * section 11.1.5.1 of the ACPI specification 3.0.
1175 */ 1175 */
1176struct thermal_zone_device *thermal_zone_device_register(char *type, 1176struct thermal_zone_device *thermal_zone_device_register(const char *type,
1177 int trips, int mask, void *devdata, 1177 int trips, int mask, void *devdata,
1178 const struct thermal_zone_device_ops *ops, 1178 const struct thermal_zone_device_ops *ops,
1179 int tc1, int tc2, int passive_delay, int polling_delay) 1179 int tc1, int tc2, int passive_delay, int polling_delay)
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 6eaf9146c847..4821735f3e77 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -146,7 +146,7 @@ enum {
146}; 146};
147#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) 147#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
148 148
149struct thermal_zone_device *thermal_zone_device_register(char *, int, int, 149struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
150 void *, const struct thermal_zone_device_ops *, int tc1, 150 void *, const struct thermal_zone_device_ops *, int tc1,
151 int tc2, int passive_freq, int polling_freq); 151 int tc2, int passive_freq, int polling_freq);
152void thermal_zone_device_unregister(struct thermal_zone_device *); 152void thermal_zone_device_unregister(struct thermal_zone_device *);