diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-01-20 11:03:07 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-20 11:03:07 +0100 |
| commit | ee65ef609aa81539ac3792df88f04bfe29a77546 (patch) | |
| tree | 6816eaa3d45fa1078408f2ccfa5f88d32733d1d9 /drivers/thermal/of-thermal.c | |
| parent | 7a839e9a277d4a410a9b015d561ff09739bc0ff6 (diff) | |
| parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
| download | linux-ee65ef609aa81539ac3792df88f04bfe29a77546.tar.bz2 | |
Merge tag 'v3.19-rc5' into devel
Linux 3.19-rc5
Diffstat (limited to 'drivers/thermal/of-thermal.c')
| -rw-r--r-- | drivers/thermal/of-thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index e145b66df444..d717f3dab6f1 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(of_thermal_is_trip_valid); * * Return: pointer to trip points table, NULL otherwise */ -const struct thermal_trip * const +const struct thermal_trip * of_thermal_get_trip_points(struct thermal_zone_device *tz) { struct __thermal_zone *data = tz->devdata; |