diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 03:12:40 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-12 03:12:40 +0300 |
| commit | a889f766dbb7d016b858e4dd157b06587fdb570f (patch) | |
| tree | e86bb71c643a0a2bd828b26ebbbaab8d780b6073 /include | |
| parent | 8f053a56dfa4be0cfcce49c7647adaa33196aae5 (diff) | |
| parent | 600c395bf6c4e44ec831e850d7f93ce53d7373be (diff) | |
| download | linux-a889f766dbb7d016b858e4dd157b06587fdb570f.tar.xz | |
Merge branch 'powercap'
* powercap:
powercap: constify powercap_zone_ops and powercap_zone_constraint_ops structures
Diffstat (limited to 'include')
| -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 { struct powercap_zone_constraint { int id; struct powercap_zone *power_zone; - struct powercap_zone_constraint_ops *ops; + const struct powercap_zone_constraint_ops *ops; }; @@ -309,7 +309,7 @@ struct powercap_zone *powercap_register_zone( struct powercap_zone *parent, const struct powercap_zone_ops *ops, int nr_constraints, - struct powercap_zone_constraint_ops *const_ops); + const struct powercap_zone_constraint_ops *const_ops); /** * powercap_unregister_zone() - Unregister a zone device |