diff options
| author | Keith Short <keithshort@chromium.org> | 2019-08-20 11:06:09 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-09-18 03:31:44 +0000 |
| commit | e9b16dbda0f7ec027c30e17905c4a737cdad2e02 (patch) | |
| tree | d62bfe3fad5b377cff9ab30e62d34b8575b28ce5 /include/charge_state.h | |
| parent | 1af858387ff7ccdd656db77340fc81b3dc7e4453 (diff) | |
| download | chrome-ec-e9b16dbda0f7ec027c30e17905c4a737cdad2e02.tar.gz | |
config: Merge CONFIG_CHARGER_V2 into CONFIG_CHARGER
For all boards that defined CONFIG_CHARGER, CONFIG_CHARGER_V2 is also
defined. Remove references to CONFIG_CHARGER_V2 from board header files.
Replace CONFIG_CHARGER_V2 in common C modules with CONFIG_CHARGER when
appropriate.
BUG=b:139699769
BRANCH=none
TEST=make buildall -j
Change-Id: I6b54baf4ad2406bbed629b6b272dad9ea6a81280
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1789420
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'include/charge_state.h')
| -rw-r--r-- | include/charge_state.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/charge_state.h b/include/charge_state.h index 4a152032fc..2f6ffa3771 100644 --- a/include/charge_state.h +++ b/include/charge_state.h @@ -146,8 +146,6 @@ const struct batt_params *charger_current_battery_params(void); /* Config Charger */ -#ifdef CONFIG_CHARGER_V2 #include "charge_state_v2.h" -#endif /* CONFIG_CHARGER_V2 */ #endif /* __CROS_EC_CHARGE_STATE_H */ |