diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-10 06:46:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-10 06:46:02 -0800 |
| commit | 564ead6a58d94c60b69c1a8aaca5c4c040ac1cc4 (patch) | |
| tree | 8a2098f2182a0620dfbefca26910592af44b96cf /include | |
| parent | 1a78d46209212e26a177c0336e17ea4ca1c2bbb5 (diff) | |
| parent | 578f8f6a7c149a06925604b7002aeffc484f0129 (diff) | |
Merge "qpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/power_supply.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index fe529be52980..41568e45c024 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -238,9 +238,9 @@ enum power_supply_property { POWER_SUPPLY_PROP_FCC_DELTA, POWER_SUPPLY_PROP_ICL_REDUCTION, POWER_SUPPLY_PROP_PARALLEL_MODE, - POWER_SUPPLY_PROP_CONNECTOR_THERM_ZONE, POWER_SUPPLY_PROP_DIE_HEALTH, POWER_SUPPLY_PROP_CONNECTOR_HEALTH, + POWER_SUPPLY_PROP_CTM_CURRENT_MAX, /* Local extensions of type int64_t */ POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT, /* Properties of type `const char *' */ |