diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 18:17:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 18:17:23 +1100 |
| commit | b3b558ccc40ca8884984c90a4f85e5a63501d11a (patch) | |
| tree | 4a96dbb78175ec3c09437383303846146819971f /include | |
| parent | 973ed9fc7f7e0f9bac8752b8ef95103f2d2f51e9 (diff) | |
| parent | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (diff) | |
Merge commit 'battery/master'
Diffstat (limited to 'include')
| -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 { extern void power_supply_changed(struct power_supply *psy); extern int power_supply_am_i_supplied(struct power_supply *psy); +#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE) +extern int power_supply_is_system_supplied(void); +#else +static inline int power_supply_is_system_supplied(void) { return -ENOSYS; } +#endif + extern int power_supply_register(struct device *parent, struct power_supply *psy); extern void power_supply_unregister(struct power_supply *psy); |