projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp...
[linux-2.6-block.git]
/
include
/
linux
/
power_supply.h
diff --git
a/include/linux/power_supply.h
b/include/linux/power_supply.h
index 68ed19ccf1f702c1978c8fb5e18ed557f316484c..ea96ead1d39daa0ac621d12ae28633e30e4c7f71 100644
(file)
--- a/
include/linux/power_supply.h
+++ b/
include/linux/power_supply.h
@@
-78,6
+78,7
@@
enum power_supply_property {
POWER_SUPPLY_PROP_CHARGE_EMPTY,
POWER_SUPPLY_PROP_CHARGE_NOW,
POWER_SUPPLY_PROP_CHARGE_AVG,
+ POWER_SUPPLY_PROP_CHARGE_COUNTER,
POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
POWER_SUPPLY_PROP_ENERGY_FULL,