Merge branch 'misc' of .git into next

This commit is contained in:
Zhang Rui 2014-01-06 22:48:19 +08:00
commit c698a4492f
1 changed files with 1 additions and 1 deletions

View File

@ -286,7 +286,7 @@ static int imx_unbind(struct thermal_zone_device *tz,
return 0; return 0;
} }
static const struct thermal_zone_device_ops imx_tz_ops = { static struct thermal_zone_device_ops imx_tz_ops = {
.bind = imx_bind, .bind = imx_bind,
.unbind = imx_unbind, .unbind = imx_unbind,
.get_temp = imx_get_temp, .get_temp = imx_get_temp,