From: Anton Vorontsov <cbouatmailru@gmail.com>
Date: Sat, 18 Oct 2008 16:28:24 +0000 (+0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~93^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ed8c3174dd227031d1f3b9fa4fbb512f8f623434

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

Conflicts:

	drivers/power/Makefile
---

ed8c3174dd227031d1f3b9fa4fbb512f8f623434
diff --cc drivers/power/Kconfig
index ae095a498db4,63bb57910445..8e0c2b47803c
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -56,16 -56,10 +56,16 @@@ config BATTERY_TOS
  	  Say Y to enable support for the battery on the Sharp Zaurus
  	  SL-6000 (tosa) models.
  
- config BATTERY_PALMTX
- 	tristate "Palm T|X battery"
- 	depends on MACH_PALMTX
+ config BATTERY_WM97XX
+ 	bool "WM97xx generic battery driver"
+ 	depends on TOUCHSCREEN_WM97XX=y
  	help
- 	  Say Y to enable support for the battery in Palm T|X.
+ 	  Say Y to enable support for battery measured by WM97xx aux port.
  
 +config BATTERY_BQ27x00
 +	tristate "BQ27200 battery driver"
 +	depends on I2C
 +	help
 +	  Say Y here to enable support for batteries with BQ27200(I2C) chip.
 +
  endif # POWER_SUPPLY
diff --cc drivers/power/Makefile
index 6cb301b779a7,4e20026cc45a..e8f1ecec5d8f
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -21,5 -21,4 +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_PALMTX)	+= palmtx_battery.o
 -obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
++obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
 +obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o