Merge branches 'fixes' and 'devel-stable' into for-linus

[mirror_ubuntu-artful-kernel.git] / drivers / watchdog / softdog.c

diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 833f49f43d43b61ca6267dd5bdf7aaa2bbea31b3..100b114e3c3c754bcffe7fb7b1abb28c951c9bf3 100644 (file)
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -151,7 +151,7 @@ static int softdog_release(struct inode *inode, struct file *file)
 {
        /*
         *      Shut off the timer.
-        *      Lock it in if it's a module and we set nowayout
+        *      Lock it in if it's a module and we set nowayout
         */
        if (expect_close == 42) {
                softdog_stop();