diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-01-06 09:48:19 -0500 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-01-06 09:48:19 -0500 |
| commit | c698a4492f01127ca90fc28cd5157f3d616fe4ff (patch) | |
| tree | f619e145e937607ebee0b97bf51a6a55ad8207b8 | |
| parent | 8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22 (diff) | |
| parent | cbb07bb35de6ebaeea27f64860bc6277a13d5b41 (diff) | |
Merge branch 'misc' of .git into next
| -rw-r--r-- | drivers/thermal/imx_thermal.c | 2 |
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, | |||
| 286 | return 0; | 286 | return 0; |
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | static const struct thermal_zone_device_ops imx_tz_ops = { | 289 | static struct thermal_zone_device_ops imx_tz_ops = { |
| 290 | .bind = imx_bind, | 290 | .bind = imx_bind, |
| 291 | .unbind = imx_unbind, | 291 | .unbind = imx_unbind, |
| 292 | .get_temp = imx_get_temp, | 292 | .get_temp = imx_get_temp, |