Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into...

[linux-2.6] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index a978ba15f6c56e78f4f83342fb4bad33b8d94d81..6413ded5fe5f26d3912af3ff75b324950e2ce12c 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -18,3 +18,5 @@ 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