Merge branches 'pm-core' and 'pm-opp'

[linux.git] / Documentation / driver-api / clk.rst

diff --git a/Documentation/driver-api/clk.rst b/Documentation/driver-api/clk.rst
index 511628bb3d3a25fcc6ffb3a8d07d2696622d47ab..593cca5058b144ae7c09d5c6f5def3fba2b07204 100644 (file)
--- a/Documentation/driver-api/clk.rst
+++ b/Documentation/driver-api/clk.rst
@@ -96,7 +96,7 @@ the operations defined in clk-provider.h::
                int             (*get_phase)(struct clk_hw *hw);
                int             (*set_phase)(struct clk_hw *hw, int degrees);
                void            (*init)(struct clk_hw *hw);
-               int             (*debug_init)(struct clk_hw *hw,
+               void            (*debug_init)(struct clk_hw *hw,
                                              struct dentry *dentry);
        };