Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

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;