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

[linux-2.6-microblaze.git] / drivers / power / 88pm860x_charger.c

diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index ffff66b..de029bb 100644 (file)
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -554,7 +554,7 @@ static irqreturn_t pm860x_vchg_handler(int irq, void *data)
                                        OVTEMP_AUTORECOVER,
                                        OVTEMP_AUTORECOVER);
                        dev_dbg(info->dev,
-                               "%s, pm8606 over-temp occure\n", __func__);
+                               "%s, pm8606 over-temp occurred\n", __func__);
                }
        }
 
@@ -562,7 +562,7 @@ static irqreturn_t pm860x_vchg_handler(int irq, void *data)
                set_vchg_threshold(info, VCHG_OVP_LOW, 0);
                info->allowed = 0;
                dev_dbg(info->dev,
-                       "%s,pm8607 over-vchg occure,vchg = %dmv\n",
+                       "%s,pm8607 over-vchg occurred,vchg = %dmv\n",
                        __func__, vchg);
        } else if (vchg < VCHG_OVP_LOW) {
                set_vchg_threshold(info, VCHG_NORMAL_LOW,