Merge branch 'topic/tasklet-convert' into for-linus

[linux-block.git] / include / linux / power_supply.h

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index ac1345a48ad051737ed2355f94e68fbaae9e2131..97cc4b85bf6126115dc97eb580463e43725eed64 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -48,6 +48,7 @@ enum {
        POWER_SUPPLY_CHARGE_TYPE_STANDARD,      /* normal speed */
        POWER_SUPPLY_CHARGE_TYPE_ADAPTIVE,      /* dynamically adjusted speed */
        POWER_SUPPLY_CHARGE_TYPE_CUSTOM,        /* use CHARGE_CONTROL_* props */
+       POWER_SUPPLY_CHARGE_TYPE_LONGLIFE,      /* slow speed, longer life */
 };
 
 enum {
@@ -62,6 +63,9 @@ enum {
        POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE,
        POWER_SUPPLY_HEALTH_OVERCURRENT,
        POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED,
+       POWER_SUPPLY_HEALTH_WARM,
+       POWER_SUPPLY_HEALTH_COOL,
+       POWER_SUPPLY_HEALTH_HOT,
 };
 
 enum {