Merge branch 'misc' of .git into next

c698a449 · Zhang Rui · 8c59ecb5 · cbb07bb3 · c698a449
Commit c698a449 authored Jan 06, 2014 by Zhang Rui
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/thermal/imx_thermal.c drivers/thermal/imx_thermal.c +1 -1

No files found.
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -286,7 +286,7 @@ static int imx_unbind(struct thermal_zone_device *tz,
 	return 0;
 }

-static const struct thermal_zone_device_ops imx_tz_ops = {
+static struct thermal_zone_device_ops imx_tz_ops = {
 	.bind = imx_bind,
 	.unbind = imx_unbind,
 	.get_temp = imx_get_temp,