Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index a877c9077adeb9c8e74a7704245043ae1e55b836..8da941a8090d42d52443668c3342c09cc7aa6453 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -22,3 +22,5 @@ obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
 obj-$(CONFIG_BATTERY_OLPC)     += olpc_battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)   += bq27x00_battery.o
 obj-$(CONFIG_TWL4030_BCI_BATTERY)      += twl4030_bci_battery.o
+obj-$(CONFIG_BATTERY_TOSA)     += tosa_battery.o
+obj-$(CONFIG_BATTERY_PALMTX)   += palmtx_battery.o