diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-21 17:21:07 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-21 17:21:07 +0100 |
commit | 2cc59440a693edb5beb1195c109ecd101f47c7d6 (patch) | |
tree | 9f2b9dddce8ba40996453f9865b84a93ca2d98c2 /drivers/power/Makefile | |
parent | 270f524f6162b047846c6756a4a67ab902ecef46 (diff) | |
parent | 80b69fcb9233a7643a3d1456c11edcae078a2e17 (diff) |
Merge branch 'platform_battery-2.6.32' into om-gta02-2.6.32
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 225abe32627..47f57ffef19 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -32,3 +32,4 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_BQ27000_HDQ) += bq27000_battery.o obj-$(CONFIG_HDQ_GPIO_BITBANG) += hdq.o +obj-$(CONFIG_BATTERY_PLATFORM) += platform_battery.o |