Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[cascardo/linux.git] / include / linux / powercap.h

diff --git a/include/linux/powercap.h b/include/linux/powercap.h
index 4e25041..f0a4e62 100644 (file)
--- 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