diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-11 22:32:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-11 22:32:42 -0700 |
| commit | 1086876c187f3b2e6623c9a1a81f6138b562a709 (patch) | |
| tree | 42eb20eb7ff13540ed875ad2b9af38f75550b719 /include/linux | |
| parent | 4d332ce41de37b5f6c8f41ad8c9ad5a21d825381 (diff) | |
| parent | 7d74a7b9f31de37e0b5ee5560fec97f52b00dbd4 (diff) | |
Merge "qpnp-smb2: add the PARALLEL_DISABLE property to usb psy"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 03853d956b41..c477f60c3f01 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -218,6 +218,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_PD_ACTIVE, POWER_SUPPLY_PROP_CHARGER_TEMP, POWER_SUPPLY_PROP_CHARGER_TEMP_MAX, + POWER_SUPPLY_PROP_PARALLEL_DISABLE, /* Local extensions of type int64_t */ POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT, /* Properties of type `const char *' */ |