diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 18:25:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 18:25:14 -0400 |
| commit | 225ff868e1eeddcda06e06854e6292b1f8bb2edb (patch) | |
| tree | c062683b3d795a60bcb06405e97b3f9e7e591281 /drivers/thermal/rcar_thermal.c | |
| parent | 209c510e3666333ad58d3080ff3ba573474a6b05 (diff) | |
| parent | 3ae53b1e13e1ca7928a3dd2d51ea5417b618560c (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management & ACPI update from Zhang Rui,
Ho humm. Normally these things go through Len. But it's just three
small fixes, I guess I can pull directly too.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
ACPI video: Ignore errors after _DOD evaluation.
thermal: solve compilation errors in rcar_thermal
Diffstat (limited to 'drivers/thermal/rcar_thermal.c')
| -rw-r--r-- | drivers/thermal/rcar_thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index d4452716aaab..f7a1b574a304 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c | |||
| @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) | |||
| 210 | goto error_free_priv; | 210 | goto error_free_priv; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | zone = thermal_zone_device_register("rcar_thermal", 0, priv, | 213 | zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv, |
| 214 | &rcar_thermal_zone_ops, 0, 0); | 214 | &rcar_thermal_zone_ops, 0, 0); |
| 215 | if (IS_ERR(zone)) { | 215 | if (IS_ERR(zone)) { |
| 216 | dev_err(&pdev->dev, "thermal zone device is NULL\n"); | 216 | dev_err(&pdev->dev, "thermal zone device is NULL\n"); |