Merge branch 'next' of git://git.denx.de/u-boot-sh

[platform/kernel/u-boot.git] / include / reset-uclass.h

diff --git a/include/reset-uclass.h b/include/reset-uclass.h
index 7b5cc3c..9a0696d 100644 (file)
--- a/include/reset-uclass.h
+++ b/include/reset-uclass.h
@@ -51,14 +51,14 @@ struct reset_ops {
         */
        int (*request)(struct reset_ctl *reset_ctl);
        /**
-        * free - Free a previously requested reset control.
+        * rfree - Free a previously requested reset control.
         *
         * This is the implementation of the client reset_free() API.
         *
         * @reset_ctl:  The reset control to free.
         * @return 0 if OK, or a negative error code.
         */
-       int (*free)(struct reset_ctl *reset_ctl);
+       int (*rfree)(struct reset_ctl *reset_ctl);
        /**
         * rst_assert - Assert a reset signal.
         *