Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / acquirewdt.c

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 2ffce4d75443821a5b2cedf1c3aceded9b57ee5a..b6a2b58cbe64a0bf05bac1761fcb47090adb35b0 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -26,7 +26,7 @@
  *     Theory of Operation:
  *             The Watch-Dog Timer is provided to ensure that standalone
  *             Systems can always recover from catastrophic conditions that
- *             caused the CPU to crash. This condition may have occured by
+ *             caused the CPU to crash. This condition may have occurred by
  *             external EMI or a software bug. When the CPU stops working
  *             correctly, hardware on the board will either perform a hardware
  *             reset (cold boot) or a non-maskable interrupt (NMI) to bring the