projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
power_supply.h
diff --git
a/include/linux/power_supply.h
b/include/linux/power_supply.h
index d37fef67ece2e65ee2e685956f3660d36cc5cd09..7d7325685c421a8b7da8746ea47583396bb61b8c 100644
(file)
--- a/
include/linux/power_supply.h
+++ b/
include/linux/power_supply.h
@@
-89,6
+89,7
@@
enum power_supply_property {
POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_VOLTAGE_AVG,
+ POWER_SUPPLY_PROP_CURRENT_MAX,
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_CURRENT_AVG,
POWER_SUPPLY_PROP_POWER_NOW,