Merge ../linux-2.6

[linux-2.6] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 1ff4b680638168b33b60d9dae2bf6e325566f8aa..6f43a54ee420228dad366db38c71e0777d9f37cf 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -15,3 +15,9 @@ endif
 obj-$(CONFIG_POWER_SUPPLY)     += power_supply.o
 
 obj-$(CONFIG_PDA_POWER)                += pda_power.o
+obj-$(CONFIG_APM_POWER)                += apm_power.o
+
+obj-$(CONFIG_BATTERY_DS2760)   += ds2760_battery.o
+obj-$(CONFIG_BATTERY_PMU)      += pmu_battery.o
+obj-$(CONFIG_BATTERY_OLPC)     += olpc_battery.o
+obj-$(CONFIG_BATTERY_PALMTX)   += palmtx_battery.o