diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 23:13:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 23:13:05 -0500 |
| commit | ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e (patch) | |
| tree | 98c162c79113bc2bd748a3ad5b6fb5ba66139751 /include/linux/pda_power.h | |
| parent | 63e9b66e29357dd12e8b1d3ebf7036e7591f81e3 (diff) | |
| parent | e91926e9ea9073d8ce95b74602e8c2d775f5a793 (diff) | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
apm_power: check I.intval for zero value, we use it as the divisor
MAINTAINERS: remove kernel-discuss@handhelds.org list
pda_power: implement polling
pda_power: various cleanups
apm_power: support using VOLTAGE_* properties for apm calculations
pda_power: add suspend/resume support
power_supply: add few more values and props
pda_power: only register available psu
power: fix incorrect unregistration in power_supply_create_attrs error path
power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL
[BATTERY] power_supply_leds: use kasprintf
[BATTERY] Every file should include the headers containing the prototypes for its global functions.
Diffstat (limited to 'include/linux/pda_power.h')
| -rw-r--r-- | include/linux/pda_power.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h index 1375f15797e7..225beb136807 100644 --- a/include/linux/pda_power.h +++ b/include/linux/pda_power.h | |||
| @@ -26,6 +26,7 @@ struct pda_power_pdata { | |||
| 26 | 26 | ||
| 27 | unsigned int wait_for_status; /* msecs, default is 500 */ | 27 | unsigned int wait_for_status; /* msecs, default is 500 */ |
| 28 | unsigned int wait_for_charger; /* msecs, default is 500 */ | 28 | unsigned int wait_for_charger; /* msecs, default is 500 */ |
| 29 | unsigned int polling_interval; /* msecs, default is 2000 */ | ||
| 29 | }; | 30 | }; |
| 30 | 31 | ||
| 31 | #endif /* __PDA_POWER_H__ */ | 32 | #endif /* __PDA_POWER_H__ */ |