From: Anton Vorontsov <cbouatmailru@gmail.com>
Date: Tue, 29 Jul 2008 22:05:23 +0000 (+0400)
Subject: Merge branch 'master' of /home/cbou/linux-2.6
X-Git-Tag: v2.6.27-rc2~110^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile
---

9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6
diff --cc drivers/power/Kconfig
index e3a9c37d08f,4d17d384578..9ce55850271
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -49,11 -49,10 +49,17 @@@ config BATTERY_OLP
  	help
  	  Say Y to enable support for the battery on the OLPC laptop.
  
 +config BATTERY_TOSA
 +	tristate "Sharp SL-6000 (tosa) battery"
 +	depends on MACH_TOSA && MFD_TC6393XB
 +	help
 +	  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
+ 	help
+ 	  Say Y to enable support for the battery in Palm T|X.
+ 
  endif # POWER_SUPPLY
diff --cc drivers/power/Makefile
index 1e408fa268c,6f43a54ee42..4706bf8ff45
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -20,4 -20,4 +20,5 @@@ obj-$(CONFIG_APM_POWER)		+= apm_power.
  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