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

[~andy/linux] / include / linux / thermal.h

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index cfc8d908892e849a3bb8a3336a8225bae554d0eb..4b94a61955df361934984992b37e185b8d933f87 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -151,7 +151,7 @@ enum {
 };
 #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
 
-struct thermal_zone_device *thermal_zone_device_register(char *, int, int,
+struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
                void *, const struct thermal_zone_device_ops *, int tc1,
                int tc2, int passive_freq, int polling_freq);
 void thermal_zone_device_unregister(struct thermal_zone_device *);