Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 6cb301b779a79eebe7be6c993c60dab53bcee717..e8f1ecec5d8fd2f5467ec1111061a96f0a1420d7 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -21,5 +21,5 @@ 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
+obj-$(CONFIG_BATTERY_WM97XX)   += wm97xx_battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)  += bq27x00_battery.o