diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 17:45:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 17:45:02 -0700 |
| commit | d8312204768861d77ec868265b2c1a36a1bf078f (patch) | |
| tree | 0cc1f5b0c37ada436b5cff49f9c5f481990a7dec /include | |
| parent | 3d4d4c8bb63a705d95a46d299469d8a10b8b229c (diff) | |
| parent | 5bf2b994bfe11bfe86231050897b2d881ca544d9 (diff) | |
| download | linux-d8312204768861d77ec868265b2c1a36a1bf078f.tar.bz2 | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
pda_power: Add optional OTG transceiver and voltage regulator support
pcf50633_charger: Remove unused mbc_set_status function
pcf50633_charger: Enable periodic charging restart
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/pcf50633/core.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/mbc.h | 1 | ||||
| -rw-r--r-- | include/linux/pda_power.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index 4455b212d75a..c8f51c3c0a72 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -29,6 +29,8 @@ struct pcf50633_platform_data { char **batteries; int num_batteries; + int charging_restart_interval; + /* Callbacks */ void (*probe_done)(struct pcf50633 *); void (*mbc_event_callback)(struct pcf50633 *, int); diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h index 6e17619b773a..4119579acf2c 100644 --- a/include/linux/mfd/pcf50633/mbc.h +++ b/include/linux/mfd/pcf50633/mbc.h @@ -128,7 +128,6 @@ enum pcf50633_reg_mbcs3 { int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma); int pcf50633_mbc_get_status(struct pcf50633 *); -void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status); #endif 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 { unsigned int wait_for_status; /* msecs, default is 500 */ unsigned int wait_for_charger; /* msecs, default is 500 */ unsigned int polling_interval; /* msecs, default is 2000 */ + + unsigned long ac_max_uA; /* current to draw when on AC */ }; #endif /* __PDA_POWER_H__ */ |