commit ed8c3174dd227031d1f3b9fa4fbb512f8f623434
author Anton Vorontsov <cbouatmailru@gmail.com> Sat Oct 18 20:28:24 2008 +0400
committer Anton Vorontsov <cbouatmailru@gmail.com> Sat Oct 18 20:28:24 2008 +0400
tree bac4953f8899d6600f4716c0bcde1e25e34c2591
parent 8aef7e8f8de2d900da892085edbf14ea35fe6881
parent 0cfd81031a26717fe14380d18275f8e217571615

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

Conflicts:

	drivers/power/Makefile

drivers/power/Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 6cb301b..e8f1ece 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -21,5 +21,5 @@
 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