summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerrit <chrome-bot@google.com>2012-05-25 10:40:56 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2012-05-25 10:40:56 -0700
commitd4fb531066c6dfd3d06b0a0760e44fec0a3986d0 (patch)
treea57d48caf3992c8d19f26021a3fc06cf26fe635c
parentc7fcad29242e8576add5b9a3640149bb1d22dd34 (diff)
parent4f34d3f9ef0013e38e5488211758641628f919d5 (diff)
downloadchrome-ec-d4fb531066c6dfd3d06b0a0760e44fec0a3986d0.tar.gz
Merge "Cleanup - includes go in include dir"
-rw-r--r--include/battery_pack.h (renamed from common/battery_pack.h)3
-rw-r--r--include/charge_state.h (renamed from common/charge_state.h)0
-rw-r--r--include/charger_bq24725.h (renamed from common/charger_bq24725.h)0
3 files changed, 1 insertions, 2 deletions
diff --git a/common/battery_pack.h b/include/battery_pack.h
index bff4481751..c119c673c0 100644
--- a/common/battery_pack.h
+++ b/include/battery_pack.h
@@ -38,5 +38,4 @@ const struct battery_info *battery_get_info(void);
/* Vendor provided parameters for battery charging */
void battery_vendor_params(struct batt_params *batt);
-#endif //__CROS_EC_BATTERY_PACK_H
-
+#endif
diff --git a/common/charge_state.h b/include/charge_state.h
index 672dab3e8b..672dab3e8b 100644
--- a/common/charge_state.h
+++ b/include/charge_state.h
diff --git a/common/charger_bq24725.h b/include/charger_bq24725.h
index 3deb41d125..3deb41d125 100644
--- a/common/charger_bq24725.h
+++ b/include/charger_bq24725.h