diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-02 06:43:48 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-02 06:43:48 (GMT) |
| commit | cc49da249cf2f380d2fed5571fad65ce6494fc95 (patch) | |
| tree | 00bf437b6a370c0640d5fafd93780406d3531ebb /drivers/power/battery/bat_trats.c | |
| parent | 9637a1bb896efe392a58dd2772e2c3fcb646409d (diff) | |
| parent | 567802bbd6bf1c809d37fef9244fc8a692244e73 (diff) | |
| download | u-boot-cc49da249cf2f380d2fed5571fad65ce6494fc95.tar.xz | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
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; } |