diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-01-06 15:48:19 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-01-06 15:48:19 +0100 |
| commit | c698a4492f01127ca90fc28cd5157f3d616fe4ff (patch) | |
| tree | f619e145e937607ebee0b97bf51a6a55ad8207b8 /drivers/thermal | |
| parent | Merge branches 'misc' and 'soc' of .git into next (diff) | |
| parent | thermal: remove const flag from .ops of imx thermal (diff) | |
| download | linux-c698a4492f01127ca90fc28cd5157f3d616fe4ff.tar.xz linux-c698a4492f01127ca90fc28cd5157f3d616fe4ff.zip | |
Merge branch 'misc' of .git into next
Diffstat (limited to 'drivers/thermal')
| -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, 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, |