diff options
author | Tom Rini <trini@ti.com> | 2014-06-08 11:58:41 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-06-08 11:58:41 (GMT) |
commit | 55e8250bd3cfd996d1caa04f520160a89ec04754 (patch) | |
tree | 64060c77eb5467f9a4c5ee421978db49d1a48ad3 /drivers/power/battery/bat_trats.c | |
parent | 3e1fa221f94b7ae3389d166882b77f1da5895f22 (diff) | |
parent | 5ed28948a3ffe6c735386e59c132989869beaa3e (diff) | |
download | u-boot-55e8250bd3cfd996d1caa04f520160a89ec04754.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/power/battery/bat_trats.c')
-rw-r--r-- | drivers/power/battery/bat_trats.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c index 41b179f..bfde692 100644 --- a/drivers/power/battery/bat_trats.c +++ b/drivers/power/battery/bat_trats.c @@ -19,7 +19,7 @@ static int power_battery_charge(struct pmic *bat) struct battery *battery = p_bat->bat; int k; - if (bat->chrg->chrg_state(p_bat->chrg, CHARGER_ENABLE, 450)) + if (bat->chrg->chrg_state(p_bat->chrg, PMIC_CHARGER_ENABLE, 450)) return -1; for (k = 0; bat->chrg->chrg_bat_present(p_bat->chrg) && @@ -42,7 +42,7 @@ static int power_battery_charge(struct pmic *bat) } } exit: - bat->chrg->chrg_state(p_bat->chrg, CHARGER_DISABLE, 0); + bat->chrg->chrg_state(p_bat->chrg, PMIC_CHARGER_DISABLE, 0); return 0; } |