summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 10:57:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 10:57:57 -0700
commit38e80121bd7d0c493072442ac7eddcba165a07a8 (patch)
tree66c948222e45b461f9d1b8917b222a0c90af9e6e /include
parente098675635479e9267cf2b12fb969c463cf506ab (diff)
parent35bf559145b6332f5465c15a4e5cd7a363985382 (diff)
downloadlinux-38e80121bd7d0c493072442ac7eddcba165a07a8.tar.gz
linux-38e80121bd7d0c493072442ac7eddcba165a07a8.tar.bz2
linux-38e80121bd7d0c493072442ac7eddcba165a07a8.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: PMU battery: filenames in sysfs with spaces pda_power: add init and exit function callbacks
Diffstat (limited to 'include')
-rw-r--r--include/linux/pda_power.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index 225beb136807..cb7d10f30763 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -16,10 +16,14 @@
#define PDA_POWER_CHARGE_AC (1 << 0)
#define PDA_POWER_CHARGE_USB (1 << 1)
+struct device;
+
struct pda_power_pdata {
+ int (*init)(struct device *dev);
int (*is_ac_online)(void);
int (*is_usb_online)(void);
void (*set_charge)(int flags);
+ void (*exit)(struct device *dev);
char **supplied_to;
size_t num_supplicants;