diff options
| author | Linus Torvalds | 2010-05-24 08:00:13 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-05-24 08:00:13 -0700 |
| commit | 15953654cc312429740fd58fb37a5a3d63a54376 (patch) | |
| tree | bbb6bf8d4ea943545e29ce896848182c4f206298 /drivers/power/Makefile | |
| parent | c3ed9ea4ab460080dea9449c709be9316c670c72 (diff) | |
| parent | 24af3202459d9a25643009b1ab8ab5ff04d94b49 (diff) | |
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/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index a2ba7c85c97a..00050809a6c7 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_MAX8925_POWER) += max8925_power.o obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o obj-$(CONFIG_WM831X_POWER) += wm831x_power.o obj-$(CONFIG_WM8350_POWER) += wm8350_power.o +obj-$(CONFIG_TEST_POWER) += test_power.o obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o obj-$(CONFIG_BATTERY_DS2782) += ds2782_battery.o @@ -31,4 +32,5 @@ obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o +obj-$(CONFIG_BATTERY_Z2) += z2_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o |