diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:12:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:12:35 -0700 |
| commit | ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b (patch) | |
| tree | 0d27fc6d7b9a0a2cdfe29833eb84ee07beac91ab /drivers/power/Makefile | |
| parent | 74e6392ca3fd445a775dd42b54d5e42cf1e706e6 (diff) | |
| parent | 906649de0eacde7a643b5a0750de6207441ad54f (diff) | |
| download | op-kernel-dev-ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b.zip op-kernel-dev-ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b.tar.gz | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
PXA: Use dev_pm_ops in z2_battery
ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
ds2760_battery: Fix indexing of the 4 active full EEPROM registers
power: Make test_power driver more dynamic.
bq27x00_battery: Name of cycle count property
max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
ARM: RX-51: Enable isp1704 power on/off
isp1704_charger: Allow board specific powering routine
gpio-charger: Add gpio_charger_resume
power_supply: Add driver for MAX8903 charger
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 8224990..009a90f 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -33,5 +33,6 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o +obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o |
