Merge branch 'master' of /home/cbou/linux-2.6

[sfrench/cifs-2.6.git] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 1e408fa268cfb7e6a6edad2d7c913f18e4ab51b2..4706bf8ff4595814565ebac8ee4cbb764ab91f63 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
 obj-$(CONFIG_BATTERY_PMU)      += pmu_battery.o
 obj-$(CONFIG_BATTERY_OLPC)     += olpc_battery.o
 obj-$(CONFIG_BATTERY_TOSA)     += tosa_battery.o
+obj-$(CONFIG_BATTERY_PALMTX)   += palmtx_battery.o