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

[~andy/linux] / drivers / thermal / rcar_thermal.c

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 88f92e1a99440c7bb3763ff691e3d01d09e2ad25..79a09d02bbca04ce97c1bf621508f3ae46d7d93d 100644 (file)
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -408,7 +408,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
                /* enable temperature comparation */
                rcar_thermal_common_write(common, ENR, 0x00030303);
 
-               idle = 0; /* polling delaye is not needed */
+               idle = 0; /* polling delay is not needed */
        }
 
        for (i = 0;; i++) {