diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:45:26 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-10 13:45:26 +0100 |
commit | 197a6fe1ccb99ba4b70ca4af07b528ff54db169a (patch) | |
tree | 47f796eb990c7b269138856ca6d0a601d8cb30ef /drivers/power/Makefile | |
parent | a03f58c61cb66164aa40cbf7bf3ff5f24a6f658b (diff) | |
parent | 41eab7673f8c0de9fa6be7abec64df99ad13a86c (diff) |
Merge branch 'platform_battery-2.6.31' into om-gta02-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 027ee9fdbcd..2ec51dc7047 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o +obj-$(CONFIG_BATTERY_PLATFORM) += platform_battery.o obj-$(CONFIG_BATTERY_BQ27000_HDQ) += bq27000_battery.o obj-$(CONFIG_HDQ_GPIO_BITBANG) += hdq.o |