diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-21 23:02:09 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-21 23:02:09 -0400 |
| commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
| tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /include/linux/pda_power.h | |
| parent | 0658c16056660886ea2f35c4f038be70a94b1532 (diff) | |
| parent | 6d25b688ecc488753af3c9e6f6a9a575b863cf37 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'include/linux/pda_power.h')
| -rw-r--r-- | include/linux/pda_power.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h index cb7d10f30763..d4cf7a2ceb3e 100644 --- a/include/linux/pda_power.h +++ b/include/linux/pda_power.h | |||
| @@ -31,6 +31,8 @@ struct pda_power_pdata { | |||
| 31 | unsigned int wait_for_status; /* msecs, default is 500 */ | 31 | unsigned int wait_for_status; /* msecs, default is 500 */ |
| 32 | unsigned int wait_for_charger; /* msecs, default is 500 */ | 32 | unsigned int wait_for_charger; /* msecs, default is 500 */ |
| 33 | unsigned int polling_interval; /* msecs, default is 2000 */ | 33 | unsigned int polling_interval; /* msecs, default is 2000 */ |
| 34 | |||
| 35 | unsigned long ac_max_uA; /* current to draw when on AC */ | ||
| 34 | }; | 36 | }; |
| 35 | 37 | ||
| 36 | #endif /* __PDA_POWER_H__ */ | 38 | #endif /* __PDA_POWER_H__ */ |