Merge tag 'iio-fixes-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux-2.6-microblaze.git] / drivers / rtc / rtc-imxdi.c

diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
index 7bffd7f..8d8049b 100644 (file)
--- a/drivers/rtc/rtc-imxdi.c
+++ b/drivers/rtc/rtc-imxdi.c
@@ -303,7 +303,7 @@ static int di_handle_invalid_state(struct imxdi_dev *imxdi, u32 dsr)
        sec = readl(imxdi->ioaddr + DTCMR);
        if (sec != 0)
                dev_warn(&imxdi->pdev->dev,
-                        "The security violation has happend at %u seconds\n",
+                        "The security violation has happened at %u seconds\n",
                         sec);
        /*
         * the timer cannot be set/modified if