diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-03 14:49:51 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-03 14:49:51 +1100 |
commit | 66eb7eb446388d9d2e2e92513748eec5c1e3ea73 (patch) | |
tree | 09b34a60f0e383b9521c8462fb95b68648e7f14b /include | |
parent | 8b21779c641726d97220f35698d5a1cd1611213f (diff) | |
parent | 5bf2b994bfe11bfe86231050897b2d881ca544d9 (diff) |
Merge commit 'battery/master'
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__ */ |