diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-11 12:48:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-11 12:48:35 -0700 |
| commit | 5abea2b1d9213da52f8f3b1aa21770f65947a757 (patch) | |
| tree | 20a8356b9b2095e1ec3c182c28de1353394e6a57 /include/linux | |
| parent | 744bdc65462b89d1b77e4e96ce4a19f810f6302d (diff) | |
| parent | 081e422149b9a683d859fc79023ce0948328b4bc (diff) | |
Merge "qcom-charger: smb138x-charger: add parallel enable status properties"
Diffstat (limited to 'include/linux')
| -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 7d1e374e176c..56e78254286e 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -174,9 +174,9 @@ enum power_supply_property { /* Local extensions */ POWER_SUPPLY_PROP_USB_HC, POWER_SUPPLY_PROP_USB_OTG, - POWER_SUPPLY_PROP_CHARGE_ENABLED, POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED, POWER_SUPPLY_PROP_CHARGING_ENABLED, + POWER_SUPPLY_PROP_PIN_ENABLED, POWER_SUPPLY_PROP_INPUT_SUSPEND, POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION, POWER_SUPPLY_PROP_INPUT_CURRENT_MAX, |