summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-01-06 22:48:19 +0800
committerZhang Rui <rui.zhang@intel.com>2014-01-06 22:48:19 +0800
commitc698a4492f01127ca90fc28cd5157f3d616fe4ff (patch)
treef619e145e937607ebee0b97bf51a6a55ad8207b8 /drivers
parent8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22 (diff)
parentcbb07bb35de6ebaeea27f64860bc6277a13d5b41 (diff)
Merge branch 'misc' of .git into next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/thermal/imx_thermal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index deab7baeeb72..45af765a3198 100644
--- 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,