diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-11 19:12:40 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-11 19:12:40 -0500 |
| commit | a889f766dbb7d016b858e4dd157b06587fdb570f (patch) | |
| tree | e86bb71c643a0a2bd828b26ebbbaab8d780b6073 /include/linux | |
| parent | 8f053a56dfa4be0cfcce49c7647adaa33196aae5 (diff) | |
| parent | 600c395bf6c4e44ec831e850d7f93ce53d7373be (diff) | |
Merge branch 'powercap'
* powercap:
powercap: constify powercap_zone_ops and powercap_zone_constraint_ops structures
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/powercap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/powercap.h b/include/linux/powercap.h index 4e250417ee30..f0a4e6257dcc 100644 --- a/include/linux/powercap.h +++ b/include/linux/powercap.h | |||
| @@ -208,7 +208,7 @@ struct powercap_zone_constraint_ops { | |||
| 208 | struct powercap_zone_constraint { | 208 | struct powercap_zone_constraint { |
| 209 | int id; | 209 | int id; |
| 210 | struct powercap_zone *power_zone; | 210 | struct powercap_zone *power_zone; |
| 211 | struct powercap_zone_constraint_ops *ops; | 211 | const struct powercap_zone_constraint_ops *ops; |
| 212 | }; | 212 | }; |
| 213 | 213 | ||
| 214 | 214 | ||
| @@ -309,7 +309,7 @@ struct powercap_zone *powercap_register_zone( | |||
| 309 | struct powercap_zone *parent, | 309 | struct powercap_zone *parent, |
| 310 | const struct powercap_zone_ops *ops, | 310 | const struct powercap_zone_ops *ops, |
| 311 | int nr_constraints, | 311 | int nr_constraints, |
| 312 | struct powercap_zone_constraint_ops *const_ops); | 312 | const struct powercap_zone_constraint_ops *const_ops); |
| 313 | 313 | ||
| 314 | /** | 314 | /** |
| 315 | * powercap_unregister_zone() - Unregister a zone device | 315 | * powercap_unregister_zone() - Unregister a zone device |