Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

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

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 9127eda2145b1eb4bacbc4690c47b3d05a07afa6..0d80e08b6439331e726fa8fe1c9f3c13e2deb0a5 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -90,7 +90,7 @@ static void wdt_setload(unsigned int timeout)
        /*
         * sp805 runs counter with given value twice, after the end of first
         * counter it gives an interrupt and then starts counter again. If
-        * interrupt already occured then it resets the system. This is why
+        * interrupt already occurred then it resets the system. This is why
         * load is half of what should be required.
         */
        load = div_u64(rate, 2) * timeout - 1;
@@ -278,7 +278,7 @@ static struct miscdevice sp805_wdt_miscdev = {
 };
 
 static int __devinit
-sp805_wdt_probe(struct amba_device *adev, struct amba_id *id)
+sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
 {
        int ret = 0;