Commit d92e600f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal control fixes for 6.0-rc3 from Daniel Lezcano:

"- Fix missing required property for thermal zone description (Daniel
   Lezcano)

 - Add missing export symbol for
   thermal_zone_device_register_with_trips() (Daniel Lezcano)"

* tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  dt-bindings: thermal: Fix missing required property
  thermal/core: Add missing EXPORT_SYMBOL_GPL
parents 568035b0 8c596324
...@@ -214,6 +214,7 @@ patternProperties: ...@@ -214,6 +214,7 @@ patternProperties:
- polling-delay - polling-delay
- polling-delay-passive - polling-delay-passive
- thermal-sensors - thermal-sensors
- trips
additionalProperties: false additionalProperties: false
......
...@@ -1329,6 +1329,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t ...@@ -1329,6 +1329,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
kfree(tz); kfree(tz);
return ERR_PTR(result); return ERR_PTR(result);
} }
EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);
struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask, struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
void *devdata, struct thermal_zone_device_ops *ops, void *devdata, struct thermal_zone_device_ops *ops,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment