diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-18 01:04:36 +0200 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-18 01:04:36 +0200 |
commit | e23313fc76e2724fe56354526275458a0bdc10c3 (patch) | |
tree | 49129c2092670f43a31c1f7ecc16d37ca9bc3ad4 /drivers/power/Makefile | |
parent | cd3258c9d166f8c64a85b0cd2c0cd64342d69eb8 (diff) | |
parent | 34e2f560d56dfdc069a8d4dab319e078806169b9 (diff) |
Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34
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 9eef9348e18..1a0ecf6c57e 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -33,5 +33,6 @@ obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_BQ27000_HDQ) += bq27000_battery.o +obj-$(CONFIG_BATTERY_PLATFORM) += platform_battery.o obj-$(CONFIG_HDQ_GPIO_BITBANG) += hdq.o |