linux-next: manual merge of the battery tree
From: Stephen Rothwell <hidden>
Date: 2008-10-15 08:04:59
Hi Anton,
Today's linux-next merge of the battery tree got a conflict in
drivers/power/Makefile between commit
4e9687d9c843dc34d368358a36f5f1610e4fbab3 ("[ARM] 5248/1: wm97xx generic
battery driver") from Linus' tree and commit
b996ad0e9fb15ca4acc60bcd0380912117a45d13 ("power_supply: Support for
Texas Instruments BQ27200 battery managers") from the battery tree.
Just overlapping addition/change. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/power/Makefile
index 4e20026,6cb301b..0000000--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile@@@ -21,4 -21,5 +21,5 @@@ obj-$(CONFIG_BATTERY_DS2760) += ds2760_ obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o - obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o -obj-$(CONFIG_BATTERY_PALMTX) += palmtx_battery.o ++obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o + obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o