Merge git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / drivers / watchdog / watchdog_core.c

diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index c1658fe73d58a19a774ebdcb227b13c6b0b5038b..7c3ba58ae1bee52022a0a9a2c06ab2a68f2d6ee9 100644 (file)
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -104,7 +104,7 @@ static void watchdog_check_min_max_timeout(struct watchdog_device *wdd)
  * timeout module parameter (if it is valid value) or the timeout-sec property
  * (only if it is a valid value and the timeout_parm is out of bounds).
  * If none of them are valid then we keep the old value (which should normally
- * be the default timeout value.
+ * be the default timeout value).
  *
  * A zero is returned on success and -EINVAL for failure.
  */
@@ -262,7 +262,7 @@ static int __watchdog_register_device(struct watchdog_device *wdd)
 
                ret = register_restart_handler(&wdd->restart_nb);
                if (ret)
-                       pr_warn("watchog%d: Cannot register restart handler (%d)\n",
+                       pr_warn("watchdog%d: Cannot register restart handler (%d)\n",
                                wdd->id, ret);
        }