Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[mv-sheeva.git] / drivers / watchdog / iop_wdt.c

diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index 96eb2cbe5874dd887ba9ec072cdba9031fd2244c..0c90596766907cb8acf686c447a280341703832b 100644 (file)
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -192,7 +192,7 @@ static int iop_wdt_release(struct inode *inode, struct file *file)
                if (test_bit(WDT_ENABLED, &wdt_status))
                        state = wdt_disable();
 
-       /* if the timer is not disbaled reload and notify that we are still
+       /* if the timer is not disabled reload and notify that we are still
         * going down
         */
        if (state != 0) {