diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-01 19:23:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-01 19:23:35 -0800 |
| commit | a49eaec204304c7c4bd7c28bc711941995d6c101 (patch) | |
| tree | 05d49cb875b29df8454e9344f0e012ea2d0b60ac /include/linux | |
| parent | 5e7d38562557ebcfea71a97bcccafd87d12d364b (diff) | |
| parent | 6802881be01834c80873fcb8c126a1226a767652 (diff) | |
Merge "power_supply: remove PARALLEL_PERCENT property"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 6a495ea6c523..8f95c91c059a 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -230,7 +230,6 @@ enum power_supply_property { POWER_SUPPLY_PROP_CHARGER_TEMP, POWER_SUPPLY_PROP_CHARGER_TEMP_MAX, POWER_SUPPLY_PROP_PARALLEL_DISABLE, - POWER_SUPPLY_PROP_PARALLEL_PERCENT, POWER_SUPPLY_PROP_PE_START, POWER_SUPPLY_PROP_SET_SHIP_MODE, POWER_SUPPLY_PROP_SOC_REPORTING_READY, |