diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
| commit | 590e935df0c94b2d7a4584bb26906666176a6133 (patch) | |
| tree | bb004c31d277423c7eb0f6bd2c0c1e9d8428e9f2 /drivers/platform/x86/acerhdf.c | |
| parent | 774b195c03ac44c0dbc4e81a3f194779692ce3bd (diff) | |
| parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-18.03-rtlsk-v3.18-18.02-rtlsk-v3.18-17.11-rtlsk-v3.18-17.09-rtlsk-v3.18-17.08-rtlsk-v3.18-17.05-rtlsk-v3.18-17.03-rtlsk-v3.18-16.07-rtlsk-v3.18-16.06-rtlsk-v3.18-16.05-rtlsk-v3.18-16.04-rtlsk-v3.18-16.03-rtlsk-v3.18-16.02-rtlsk-v3.18-16.01-rtlsk-v3.18-15.12-rtlsk-v3.18-15.11-rtlsk-v3.18-15.10-rtlsk-v3.18-15.09-rtlsk-v3.18-15.08-rtlsk-v3.18-15.07-rtlinux-linaro-lsk-v3.18-rt
Diffstat (limited to 'drivers/platform/x86/acerhdf.c')
| -rw-r--r-- | drivers/platform/x86/acerhdf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index f94467c05225..7f21f75baa59 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -330,7 +330,8 @@ static int acerhdf_bind(struct thermal_zone_device *thermal, return 0; if (thermal_zone_bind_cooling_device(thermal, 0, cdev, - THERMAL_NO_LIMIT, THERMAL_NO_LIMIT)) { + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT, + THERMAL_WEIGHT_DEFAULT)) { pr_err("error binding cooling dev\n"); return -EINVAL; } |