diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-20 10:08:26 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-20 10:08:26 -0800 |
| commit | e7d1ccb3faf1dbb669f023a3f4f76ffbaf800864 (patch) | |
| tree | 676a9875f8a950f67c0f442a4d47418f1ada5b30 /include | |
| parent | 41bb68940b841b6f97afa597f4e637851ba54b4f (diff) | |
| parent | 9c5b523f78f344d72fb934f1f6c021b58316feec (diff) | |
Merge "power: qcom-charger: delay ICL change reporting to parallel psy"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/power_supply.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 457d862cb9a8..1effc355d7d0 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -106,9 +106,10 @@ enum { }; enum { - POWER_SUPPLY_PARALLEL_NONE, - POWER_SUPPLY_PARALLEL_USBIN_USBIN, - POWER_SUPPLY_PARALLEL_MID_MID, + POWER_SUPPLY_PL_NONE, + POWER_SUPPLY_PL_USBIN_USBIN, + POWER_SUPPLY_PL_USBIN_USBIN_EXT, + POWER_SUPPLY_PL_USBMID_USBMID, }; enum power_supply_property { |