diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 15:00:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 15:00:13 (GMT) |
| commit | 15953654cc312429740fd58fb37a5a3d63a54376 (patch) | |
| tree | bbb6bf8d4ea943545e29ce896848182c4f206298 /drivers/power/power_supply.h | |
| parent | c3ed9ea4ab460080dea9449c709be9316c670c72 (diff) | |
| parent | 24af3202459d9a25643009b1ab8ab5ff04d94b49 (diff) | |
| download | linux-fsl-qoriq-15953654cc312429740fd58fb37a5a3d63a54376.tar.xz | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
ds2760_battery: Document ABI change
ds2760_battery: Make charge_now and charge_full writeable
power_supply: Add support for writeable properties
power_supply: Use attribute groups
power_supply: Add test_power driver
tosa_battery: Fix build error due to direct driver_data usage
wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared)
ds2782_battery: Get rid of magic numbers in driver_data
ds2782_battery: Add support for ds2786 battery gas gauge
pda_power: Add function callbacks for suspend and resume
wm831x_power: Use genirq
Driver for Zipit Z2 battery chip
ds2782_battery: Fix clientdata on removal
Diffstat (limited to 'drivers/power/power_supply.h')
| -rw-r--r-- | drivers/power/power_supply.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h index f38ba48..018de2b 100644 --- a/drivers/power/power_supply.h +++ b/drivers/power/power_supply.h @@ -12,15 +12,12 @@ #ifdef CONFIG_SYSFS -extern int power_supply_create_attrs(struct power_supply *psy); -extern void power_supply_remove_attrs(struct power_supply *psy); +extern void power_supply_init_attrs(struct device_type *dev_type); extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env); #else -static inline int power_supply_create_attrs(struct power_supply *psy) -{ return 0; } -static inline void power_supply_remove_attrs(struct power_supply *psy) {} +static inline void power_supply_init_attrs(struct device_type *dev_type) {} #define power_supply_uevent NULL #endif /* CONFIG_SYSFS */ |