diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:49:08 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:49:08 +0100 |
| commit | 4331f6c95fadc37ea89359d6afb915be838790f9 (patch) | |
| tree | 2a130641c946e34c73700ef7fe013e8f6d50b7cd /drivers/power/Makefile | |
| parent | 7210ee5b3abe280f6ef06b26381c93a7f2570837 (diff) | |
| parent | a6efcec534efc811a469a9e87ca5ec5cf26d11e1 (diff) | |
Merge branch 'om-gta02-2.6.31' into om-2.6.31
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
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 6dc969dcce0..63981273a77 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_CHARGER_PCF50606) += pcf50606-charger.o +obj-$(CONFIG_BATTERY_PLATFORM) += platform_battery.o obj-$(CONFIG_BATTERY_BQ27000_HDQ) += bq27000_battery.o obj-$(CONFIG_HDQ_GPIO_BITBANG) += hdq.o |