Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / power / pm2301_charger.c

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index e9c6ba0fee7bf9b5f3ef62eeca42a543dcaa85a2..fef56e2041b325cf9e086d434f1755fbca0a8857 100644 (file)
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -226,7 +226,7 @@ static int pm2xxx_charger_ovv_mngt(struct pm2xxx_charger *pm2, int val)
 
 static int pm2xxx_charger_wd_exp_mngt(struct pm2xxx_charger *pm2, int val)
 {
-       dev_dbg(pm2->dev , "20 minutes watchdog occured\n");
+       dev_dbg(pm2->dev , "20 minutes watchdog expired\n");
 
        pm2->ac.wd_expired = true;
        power_supply_changed(&pm2->ac_chg.psy);