diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:44:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:44:30 -0400 |
| commit | 7d67474e506598fe26e0c262acf02132dc730517 (patch) | |
| tree | 45ad83d853a1a461f8c86b964861336e4e913851 /include/linux | |
| parent | 252883e512c6d8fbc03b6738f1620fda44c4d472 (diff) | |
| parent | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (diff) | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
bq27x00_battery: use unaligned access helper
power_supply: fix dependency of tosa_battery
power_supply: Support for Texas Instruments BQ27200 battery managers
power_supply: Add function to return system-wide power state
pda_power: Check and handle return value of set_irq_wake
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index ea96ead1d39d..f9348cba6dc1 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
| @@ -165,6 +165,12 @@ struct power_supply_info { | |||
| 165 | extern void power_supply_changed(struct power_supply *psy); | 165 | extern void power_supply_changed(struct power_supply *psy); |
| 166 | extern int power_supply_am_i_supplied(struct power_supply *psy); | 166 | extern int power_supply_am_i_supplied(struct power_supply *psy); |
| 167 | 167 | ||
| 168 | #if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE) | ||
| 169 | extern int power_supply_is_system_supplied(void); | ||
| 170 | #else | ||
| 171 | static inline int power_supply_is_system_supplied(void) { return -ENOSYS; } | ||
| 172 | #endif | ||
| 173 | |||
| 168 | extern int power_supply_register(struct device *parent, | 174 | extern int power_supply_register(struct device *parent, |
| 169 | struct power_supply *psy); | 175 | struct power_supply *psy); |
| 170 | extern void power_supply_unregister(struct power_supply *psy); | 176 | extern void power_supply_unregister(struct power_supply *psy); |