diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:55:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:55:07 -0700 |
| commit | b14f7fb5aa2f4289e3a9fa8d7d92417ec8607498 (patch) | |
| tree | 8f0ef2cf36dbf096e91c89f5917a24fb363f6101 /include | |
| parent | 00e9028a95fb8a4d79f2fb695a853f33ea7d3b57 (diff) | |
| parent | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (diff) | |
| download | linux-b14f7fb5aa2f4289e3a9fa8d7d92417ec8607498.tar.bz2 | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply: Sharp SL-6000 (tosa) batteries support
power_supply: fix up CHARGE_COUNTER output to be more precise
power_supply: add CHARGE_COUNTER property and olpc_battery support for it
power_supply: bump EC version check that we refuse to run with in olpc_battery
power_supply: cleanup of the OLPC battery driver
power_supply: add eeprom dump file to olpc_battery's sysfs
power_supply: Support serial number in olpc_battery
Diffstat (limited to 'include')
| -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 68ed19ccf1f7..ea96ead1d39d 100644 --- 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, |