diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 05:14:15 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:14:15 -0500 |
| commit | 156d821270e131dee7d89fc4aa385f0f9b1900ea (patch) | |
| tree | 2d3a4bfea184033c1eae48846ecd357c82021e85 /drivers | |
| parent | 3e098984073795bff5e5e3edbc1f5b0514c47c92 (diff) | |
| parent | 5b275ce27077d6463ca28c9671dce7c2c1f622e2 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/thermal_sys.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 760e045c93c..7d0e63c7928 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -841,11 +841,8 @@ static struct class thermal_class = { * @devdata: device private data. * @ops: standard thermal cooling devices callbacks. */ -struct thermal_cooling_device *thermal_cooling_device_register(char *type, - void *devdata, - struct - thermal_cooling_device_ops - *ops) +struct thermal_cooling_device *thermal_cooling_device_register( + char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { struct thermal_cooling_device *cdev; struct thermal_zone_device *pos; @@ -1066,13 +1063,9 @@ EXPORT_SYMBOL(thermal_zone_device_update); * section 11.1.5.1 of the ACPI specification 3.0. */ struct thermal_zone_device *thermal_zone_device_register(char *type, - int trips, - void *devdata, struct - thermal_zone_device_ops - *ops, int tc1, int - tc2, - int passive_delay, - int polling_delay) + int trips, void *devdata, + const struct thermal_zone_device_ops *ops, + int tc1, int tc2, int passive_delay, int polling_delay) { struct thermal_zone_device *tz; struct thermal_cooling_device *pos; |