Merge tag 'rxrpc-fixes-20160809' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / include / linux / watchdog.h

diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index 51732d6c9555decf5264da14a8d611524fab9b4e..7047bc7f810688bff4511a2d087d5207676b62b3 100644 (file)
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -66,7 +66,8 @@ struct watchdog_ops {
  *             as configurable from user space. Only relevant if
  *             max_hw_heartbeat_ms is not provided.
  * @min_hw_heartbeat_ms:
- *             Minimum time between heartbeats, in milli-seconds.
+ *             Hardware limit for minimum time between heartbeats,
+ *             in milli-seconds.
  * @max_hw_heartbeat_ms:
  *             Hardware limit for maximum timeout, in milli-seconds.
  *             Replaces max_timeout if specified.
@@ -180,4 +181,7 @@ extern int watchdog_init_timeout(struct watchdog_device *wdd,
 extern int watchdog_register_device(struct watchdog_device *);
 extern void watchdog_unregister_device(struct watchdog_device *);
 
+/* devres register variant */
+int devm_watchdog_register_device(struct device *dev, struct watchdog_device *);
+
 #endif  /* ifndef _LINUX_WATCHDOG_H */