diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-03-05 21:37:49 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-03-05 21:37:49 +0100 |
| commit | 166d017d345904444f21b203f3b7bc75f34b94ac (patch) | |
| tree | 7da8169d891056776882c707e6792951ae69cda7 /drivers/platform | |
| parent | f1f0c445226c8f03ad329cc2d8072556198fb24a (diff) | |
| parent | 32abd250879a272fd96da48db59fde5ef71946cf (diff) | |
Merge thermal core changes for 6.9 to satisfy a dependency.
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/acerhdf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 74bcb3d13104..018c48429616 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -678,7 +678,7 @@ static int __init acerhdf_register_thermal(void) return -EINVAL; thz_dev = thermal_zone_device_register_with_trips("acerhdf", trips, ARRAY_SIZE(trips), - 0, NULL, &acerhdf_dev_ops, + NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0, (kernelmode) ? interval*1000 : 0); if (IS_ERR(thz_dev)) |